diff options
142 files changed, 5728 insertions, 3305 deletions
diff --git a/.gitignore b/.gitignore index 0ca7df8e02..a188a82bb1 100644 --- a/.gitignore +++ b/.gitignore @@ -189,6 +189,7 @@ /test-mktemp /test-parse-options /test-path-utils +/test-regex /test-revision-walking /test-run-command /test-sha1 diff --git a/Documentation/RelNotes/1.7.11.6.txt b/Documentation/RelNotes/1.7.11.6.txt index e548a59824..ba7d3c3966 100644 --- a/Documentation/RelNotes/1.7.11.6.txt +++ b/Documentation/RelNotes/1.7.11.6.txt @@ -4,31 +4,81 @@ Git v1.7.11.6 Release Notes Fixes since v1.7.11.5 --------------------- -This is primarily documentation and low-impact code clarification. - - - "ciabot" script (in contrib/) has been updated with extensive + * "ciabot" script (in contrib/) has been updated with extensive documentation. - - The "--rebase" option to "git pull" can be abbreviated to "-r", - but we didn't document it. + * "git foo" errored out with "Not a directory" when the user had a + non-directory on $PATH, and worse yet it masked an alias "foo" from + running. - - It was generally understood that "--long-option"s to many of our - subcommands can be abbreviated to the unique prefix, but it was not - easy to find it described for new readers of the documentation set. + * When the user exports a non-default IFS without HT, scripts that + rely on being able to parse "ls-files -s | while read a b c..." + started to fail. Protect them from such a misconfiguration. - - The "--topo-order", "--date-order" (and the lack of either means - the default order) options to "rev-list" and "log" family of - commands were poorly described in the documentation. + * When the user gives an argument that can be taken as both a + revision name and a pathname without disambiguating with "--", we + used to give a help message "Use '--' to separate". The message + has been clarified to show where that '--' goes on the command + line. + + * Documentation for the configuration file format had a confusing + example. - - Older parts of the documentation described as if having a regular + * Older parts of the documentation described as if having a regular file in .git/refs/ hierarchy were the only way to have branches and tags, which is not true for quite some time. - - A utility shell function test_seq has been added as a replacement - for the 'seq' utility found on some platforms. + * It was generally understood that "--long-option"s to many of our + subcommands can be abbreviated to the unique prefix, but it was not + easy to find it described for new readers of the documentation set. - - Fallback 'getpass' implementation made unportable use of stdio API. + * The "--topo-order", "--date-order" (and the lack of either means + the default order) options to "rev-list" and "log" family of + commands were poorly described in the documentation. - - "git commit --amend" let the user edit the log message and then + * "git commit --amend" let the user edit the log message and then died when the human-readable committer name was given insufficiently by getpwent(3). + + * The exit status code from "git config" was way overspecified while + being incorrect. The implementation has been updated to give the + documented status for a case that was documented, and introduce a + new code for "all other errors". + + * The output from "git diff -B" for a file that ends with an + incomplete line did not put "\ No newline..." on a line of its own. + + * "git diff" had a confusion between taking data from a path in the + working tree and taking data from an object that happens to have + name 0{40} recorded in a tree. + + * The "--rebase" option to "git pull" can be abbreviated to "-r", + but we didn't document it. + + * When "git push" triggered the automatic gc on the receiving end, a + message from "git prune" that said it was removing cruft leaked to + the standard output, breaking the communication protocol. + + * The reflog entries left by "git rebase" and "git rebase -i" were + inconsistent (the interactive one gave an abbreviated object name). + + * "git send-email" did not unquote encoded words that appear on the + header correctly, and lost "_" from strings. + + * "git stash apply/pop" did not trigger "rerere" upon conflicts + unlike other mergy operations. + + * "git submodule <cmd> path" did not error out when the path to the + submodule was misspelt. + + * "git submodule update -f" did not update paths in the working tree + that has local changes. + (merge 01d4721 sz/submodule-force-update later to maint). + + * "gitweb" when used with PATH_INFO failed to notice directories with + SP (and other characters that need URL-style quoting) in them. + + * Fallback 'getpass' implementation made unportable use of stdio API. + + * A utility shell function test_seq has been added as a replacement + for the 'seq' utility found on some platforms. diff --git a/Documentation/RelNotes/1.7.11.7.txt b/Documentation/RelNotes/1.7.11.7.txt new file mode 100644 index 0000000000..e7e79d999b --- /dev/null +++ b/Documentation/RelNotes/1.7.11.7.txt @@ -0,0 +1,46 @@ +Git v1.7.11.7 Release Notes +=========================== + +Fixes since v1.7.11.6 +--------------------- + + * The synopsis said "checkout [-B branch]" to make it clear the + branch name is a parameter to the option, but the heading for the + option description was "-B::", not "-B branch::", making the + documentation misleading. + + * Git ships with a fall-back regexp implementation for platforms with + buggy regexp library, but it was easy for people to keep using their + platform regexp. A new test has been added to check this. + + * "git apply -p0" did not parse pathnames on "diff --git" line + correctly. This caused patches that had pathnames in no other + places to be mistakenly rejected (most notably, binary patch that + does not rename nor change mode). Textual patches, renames or mode + changes have preimage and postimage pathnames in different places + in a form that can be parsed unambiguously and did not suffer from + this problem. + + * After "gitk" showed the contents of a tag, neither "Reread + references" nor "Reload" did not update what is shown as the + contents of it, when the user overwrote the tag with "git tag -f". + + * "git for-each-ref" did not currectly support more than one --sort + option. + + * "git log .." errored out saying it is both rev range and a path + when there is no disambiguating "--" is on the command line. + Update the command line parser to interpret ".." as a path in such + a case. + + * Pushing to smart HTTP server with recent Git fails without having + the username in the URL to force authentication, if the server is + configured to allow GET anonymously, while requiring authentication + for POST. + + * "git show --format='%ci'" did not give timestamp correctly for + commits created without human readable name on "committer" line. + (merge e27ddb6 jc/maint-ident-missing-human-name later to maint). + + * "git show --quiet" ought to be a synonym for "git show -s", but + wasn't. diff --git a/Documentation/RelNotes/1.7.12.1.txt b/Documentation/RelNotes/1.7.12.1.txt new file mode 100644 index 0000000000..b8f04af19f --- /dev/null +++ b/Documentation/RelNotes/1.7.12.1.txt @@ -0,0 +1,134 @@ +Git 1.7.12.1 Release Notes +========================== + +Fixes since v1.7.12 +------------------- + + * "git apply -p0" did not parse pathnames on "diff --git" line + correctly. This caused patches that had pathnames in no other + places to be mistakenly rejected (most notably, binary patch that + does not rename nor change mode). Textual patches, renames or mode + changes have preimage and postimage pathnames in different places + in a form that can be parsed unambiguously and did not suffer from + this problem. + + * "git cherry-pick A C B" used to replay changes in A and then B and + then C if these three commits had committer timestamps in that + order, which is not what the user who said "A C B" naturally + expects. + + * "git commit --amend" let the user edit the log message and then + died when the human-readable committer name was given + insufficiently by getpwent(3). + + * Some capabilities were asked by fetch-pack even when upload-pack + did not advertise that they are available. fetch-pack has been + fixed not to do so. + + * "git diff" had a confusion between taking data from a path in the + working tree and taking data from an object that happens to have + name 0{40} recorded in a tree. + + * "git for-each-ref" did not correctly support more than one --sort + option. + + * "git log .." errored out saying it is both rev range and a path + when there is no disambiguating "--" is on the command line. + Update the command line parser to interpret ".." as a path in such + a case. + + * The "--topo-order", "--date-order" (and the lack of either means + the default order) options to "rev-list" and "log" family of + commands were poorly described in the documentation. + + * "git prune" without "-v" used to warn about leftover temporary + files (which is an indication of an earlier aborted operation). + + * Pushing to smart HTTP server with recent Git fails without having + the username in the URL to force authentication, if the server is + configured to allow GET anonymously, while requiring authentication + for POST. + + * The reflog entries left by "git rebase" and "git rebase -i" were + inconsistent (the interactive one gave an abbreviated object name). + + * When "git push" triggered the automatic gc on the receiving end, a + message from "git prune" that said it was removing cruft leaked to + the standard output, breaking the communication protocol. + + * "git show --quiet" ought to be a synonym for "git show -s", but + wasn't. + + * "git show --format='%ci'" did not give timestamp correctly for + commits created without human readable name on "committer" line. + + * "git send-email" did not unquote encoded words that appear on the + header correctly, and lost "_" from strings. + + * The interactive prompt "git send-email" gives was error prone. It + asked "What e-mail address do you want to use?" with the address it + guessed (correctly) the user would want to use in its prompt, + tempting the user to say "y". But the response was taken as "No, + please use 'y' as the e-mail address instead", which is most + certainly not what the user meant. + + * "gitweb" when used with PATH_INFO failed to notice directories with + SP (and other characters that need URL-style quoting) in them. + + * When the user gives an argument that can be taken as both a + revision name and a pathname without disambiguating with "--", we + used to give a help message "Use '--' to separate". The message + has been clarified to show where that '--' goes on the command + line. + + * When the user exports a non-default IFS without HT, scripts that + rely on being able to parse "ls-files -s | while read a b c..." + started to fail. Protect them from such a misconfiguration. + + * The attribute system may be asked for a path that itself or its + leading directories no longer exists in the working tree, and it is + fine if we cannot open .gitattribute file in such a case. Failure + to open per-directory .gitattributes with error status other than + ENOENT and ENOTDIR should be diagnosed, but it wasn't. + + * After "gitk" showed the contents of a tag, neither "Reread + references" nor "Reload" did not update what is shown as the + contents of it, when the user overwrote the tag with "git tag -f". + + * "ciabot" script (in contrib/) has been updated with extensive + documentation. + + * "git-jump" script (in contrib/) did not work well when + diff.noprefix or diff.mnemonicprefix is in effect. + + * Older parts of the documentation described as if having a regular + file in .git/refs/ hierarchy were the only way to have branches and + tags, which is not true for quite some time. + + * A utility shell function test_seq has been added as a replacement + for the 'seq' utility found on some platforms. + + * Compatibility wrapper to learn the maximum number of file + descriptors we can open around sysconf(_SC_OPEN_MAX) and + getrlimit(RLIMIT_NO_FILE) has been introduced for portability. + + * We used curl_easy_strerror() without checking version of cURL, + breaking the build for versions before curl 7.12.0. + + * Code to work around MacOS X UTF-8 gotcha has been cleaned up. + + * Fallback 'getpass' implementation made unportable use of stdio API. + + * The "--rebase" option to "git pull" can be abbreviated to "-r", + but we didn't document it. + + * It was generally understood that "--long-option"s to many of our + subcommands can be abbreviated to the unique prefix, but it was not + easy to find it described for new readers of the documentation set. + + * The synopsis said "checkout [-B branch]" to make it clear the + branch name is a parameter to the option, but the heading for the + option description was "-B::", not "-B branch::", making the + documentation misleading. + +Also contains numerous documentation updates. diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt index 2503062408..87719bfe2b 100644 --- a/Documentation/RelNotes/1.8.0.txt +++ b/Documentation/RelNotes/1.8.0.txt @@ -15,6 +15,10 @@ preference configuration variable "push.default" to change this, and "git push" will warn about the upcoming change until you set this variable. +"git branch --set-upstream" is deprecated and may be removed in a +relatively distant future. "git branch [-u|--set-upstream-to]" has +been introduced with a saner order of arguments. + Updates since v1.7.12 --------------------- @@ -24,9 +28,28 @@ UI, Workflows & Features * A credential helper for Win32 to allow access to the keychain of the logged-in user has been added. + * A credential helper to allow access to the Gnome keyring has been + added. + + * When "git am" sanitizes the Subject: line, we strip the prefix from + "Re: subject" and also from a less common "re: subject", but left + even less common "RE: subject" intact. + + * It was tempting to say "git branch --set-upstream origin/master", + but that tells Git to arrange the local branch "origin/master" to + integrate with the currently checked out branch, which is highly + unlikely what the user meant. The option is deprecated; use the + new "--set-upstream-to" (with a short-and-sweet "-u") option + instead. + * "git cherry-pick" learned the "--allow-empty-message" option to allow it to replay a commit without any log message. + * After "git cherry-pick -s" gave control back to the user asking + help to resolve conflicts, concluding "git commit" used to need to + be run with "-s" if the user wants to sign it off; now the command + leaves the sign-off line in the log template. + * "git daemon" learned the "--access-hook" option to allow an external command to decline service based on the client address, repository path, etc. @@ -37,12 +60,27 @@ UI, Workflows & Features * "git grep" learned to use a non-standard pattern type by default if a configuration variable tells it to. + * "git merge-base" learned "--is-ancestor A B" option to tell if A is + an ancestor of B. The result is indicated by its exit status code. + + * The "-Xours" backend option to "git merge -s recursive" now takes + effect even on binary files. + + Foreign Interface * "git svn" has been updated to work with SVN 1.7. + * "git p4" learned "--conflicts" option to specify what to do when + encountering a conflict during "p4 submit". + + Performance, Internal Implementation, etc. (please report possible regressions) + * Git ships with a fall-back regexp implementation for platforms with + buggy regexp library, but it was easy for people to keep using their + platform regexp. A new test has been added to check this. + * The "check-docs" build target has been updated and greatly simplified. @@ -50,13 +88,24 @@ Performance, Internal Implementation, etc. (please report possible regressions) for materials meant to be examples that are better typeset in monospace. - * Compatibility wrapper to learn the maximum number of file - descriptors we can open around sysconf(_SC_OPEN_MAX) and - getrlimit(RLIMIT_NO_FILE) has been introduced for portability. - * Compatibility wrapper around some mkdir(2) implementations that reject parameter with trailing slash has been introduced. + * Compatibility wrapper for systems that lack usable setitimer() has + been added. + + * The option parsing of "git checkout" had error checking, dwim and + defaulting missing options, all mixed in the code, and issuing an + appropriate error message with useful context was getting harder. + The code has been reorganized to allow giving a proper diagnosis + when the user says "git checkout -b -t foo bar" (e.g. "-t" is not a + good name for a branch). + + * Many internal uses of "git merge-base" equivalent were only to see + if one commit fast-forwards to the other, which did not need the + full set of merge bases to be computed. They have been updated to + use less expensive checks. + * The heuristics to detect and silently convert latin1 to utf8 when we were told to use utf-8 in the log message has been transplanted from "mailinfo" to "commit" and "commit-tree". @@ -64,6 +113,7 @@ Performance, Internal Implementation, etc. (please report possible regressions) * Messages given by "git <subcommand> -h" from many subcommands have been marked for translation. + Also contains minor documentation updates and code clean-ups. @@ -74,6 +124,73 @@ Unless otherwise noted, all the fixes since v1.7.12 in the maintenance track are contained in this release (see release notes to them for details). + * "git blame MAKEFILE" run in a history that has "Makefile" but not + "MAKEFILE" should say "No such file MAKEFILE in HEAD", but got + confused on a case insensitive filesystem and failed to do so. + (merge 9aeaab6 jc/maint-blame-no-such-path later to maint). + + * Even during a conflicted merge, "git blame $path" always meant to + blame uncommitted changes to the "working tree" version; make it + more useful by showing cleanly merged parts as coming from the other + branch that is being merged. + (merge 9aeaab6 jc/maint-blame-no-such-path later to maint). + + * Documentation talked about "first line of commit log" when it meant + the title of the commit. The description was clarified by defining + how the title is decided and rewording the casual mention of "first + line" to "title". + (merge 52ffe99 jw/doc-commit-title later to maint). + + * The attribute system may be asked for a path that itself or its + leading directories no longer exists in the working tree, and it is + fine if we cannot open .gitattribute file in such a case. Failure + to open per-directory .gitattributes with error status other than + ENOENT and ENOTDIR should be diagnosed, but it wasn't. + + * "git log --all-match --grep=A --grep=B" ought to show commits that + mention both A and B, but when these three options are used with + --author or --committer, it showed commits that mention either A or + B (or both) instead. + (merge 39f2e01 jc/maint-log-grep-all-match later to maint). + + * Earlier we made the diffstat summary line that shows the number of + lines added/deleted localizable, but it was found irritating having + to see them in various languages on a list whose discussion language + is English. + (merge 218adaa nd/maint-diffstat-summary later to maint). + + * "git fetch --all", when passed "--no-tags", did not honor the + "--no-tags" option while fetching from individual remotes (the same + issue existed with "--tags", but combination "--all --tags" makes + much less sense than "--all --no-tags"). + (merge 8556646 dj/fetch-all-tags later to maint). + + * The subcommand in "git remote" to remove a defined remote was + "rm" and the command did not take a fully-spelled "remove". + (merge e17dba8 nd/maint-remote-remove later to maint). + + * After "gitk" showed the contents of a tag, neither "Reread + references" nor "Reload" did not update what is shown as the + contents of it, when the user overwrote the tag with "git tag -f". + + * "git cvsimport" did not thoroughly cleanse tag names that it + inferred from the names of the tags it obtained from CVS, which + caused "git tag" to barf and stop the import in the middle. + + * "git show --format='%ci'" did not give timestamp correctly for + commits created without human readable name on "committer" line. + (merge e27ddb6 jc/maint-ident-missing-human-name later to maint). + + * "git cherry-pick A C B" used to replay changes in A and then B and + then C if these three commits had committer timestamps in that + order, which is not what the user who said "A C B" naturally + expects. + (merge a73e22e mz/cherry-pick-cmdline-order later to maint). + + * "git show --quiet" ought to be a synonym for "git show -s", but + wasn't. + (merge f9c75d8 jk/maint-quiet-is-synonym-to-s-in-log later to maint). + * "git p4", when "--use-client-spec" and "--detect-branches" are used together, misdetected branches. (merge 21ef5df pw/p4-use-client-spec-branch-detection later to maint). @@ -83,125 +200,14 @@ to them for details). branches were counting in bytes, not in display columns. (merge 1452bd6 nd/branch-v-alignment later to maint). - * "git for-each-ref" did not currectly support more than one --sort - option. - (merge 3b51222 kk/maint-for-each-ref-multi-sort later to maint). - - * Pushing to smart HTTP server with recent Git fails without having - the username in the URL to force authentication, if the server is - configured to allow GET anonymously, while requiring authentication - for POST. - (merge b81401c jk/maint-http-half-auth-push later to maint). - * When looking for $HOME/.gitconfig etc., it is OK if we cannot read them because they do not exist, but we did not diagnose existing files that we cannot read. - * The synopsis said "checkout [-B branch]" to make it clear the - branch name is a parameter to the option, but the heading for the - option description was "-B::", not "-B branch::", making the - documentation misleading. There may be room in documentation pages - of other commands for similar improvements (hint, hint). - (merge 45aaf03 jc/maint-doc-checkout-b-always-takes-branch-name later to maint). - - * "git log .." errored out saying it is both rev range and a path - when there is no disambiguating "--" is on the command line. - Update the command line parser to interpret ".." as a path in such - a case. - (merge 003c84f jc/dotdot-is-parent-directory later to maint). - - * "git apply -p0" did not parse pathnames on "diff --git" line - correctly. This caused patches that had pathnames in no other - places to be mistakenly rejected (most notably, binary patch that - does not rename nor change mode). Textual patches, renames or mode - changes have preimage and postimage pathnames in different places - in a form that can be parsed unambiguously and did not suffer from - this problem. - (merge 6a2abdc jc/apply-binary-p0 later to maint). - - * The exit status code from "git config" was way overspecified while - being incorrect. The implementation has been updated to give the - documented status for a case that was documented, and introduce a - new code for "all other errors". - (merge 9409c7a jc/maint-config-exit-status later to maint). - - * "git foo" errored out with "Not a directory" when the user had a - non-directory on $PATH, and worse yet it masked an alias "foo" from - running. (merge a785508 jc/maint-sane-execvp-notdir later to - maint). - * The interactive prompt "git send-email" gives was error prone. It asked "What e-mail address do you want to use?" with the address it guessed (correctly) the user would want to use in its prompt, tempting the user to say "y". But the response was taken as "No, please use 'y' as the e-mail address instead", which is most certainly not what the user meant. - (merge 51bbccf jc/send-email-reconfirm later to maint). - - * "git stash apply/pop" did not trigger "rerere" upon conflicts - unlike other mergy operations. - (merge 743bf6d ph/stash-rerere later to maint). - - * "git submodule update -f" did not update paths in the working tree - that has local changes. - (merge 01d4721 sz/submodule-force-update later to maint). - - * We used curl_easy_strerror() without checking version of cURL, - breaking the build for versions before curl 7.12.0. - (merge 4246b0b js/no-curl-easy-strerror-on-old-curl later to maint). - - * Code to work around MacOS X UTF-8 gotcha has been cleaned up. - (merge 9a27f96 rr/precompose-utf8-cleanup later to maint). - - * Documentation for the configuration file format had a confusing - example. - (merge d1e1fe7 mh/maint-config-doc-proxy-command later to maint). - - * "git submodule <cmd> path" did not error out when the path to the - submodule was misspelt. - (merge be9d0a3 hv/submodule-path-unmatch later to maint). - - * Some capabilities were asked by fetch-pack even when upload-pack - did not advertise that they are available. fetch-pack has been - fixed not to do so. - - * The reflog entries left by "git rebase" and "git rebase -i" were - inconsistent (the interactive one gave an abbreviated object name). - (merge 1af221e mg/rebase-i-onto-reflog-in-full later to maint). - - * When the user exports a non-default IFS without HT, scripts that - rely on being able to parse "ls-files -s | while read a b c..." - start to fail. Protect them from such a misconfiguration. - (merge 785063e jc/maint-protect-sh-from-ifs later to maint). - - * "git prune" without "-v" used to warn about leftover temporary - files (which is an indication of an earlier aborted operation). - (merge 90b29cb bc/prune-info later to maint). - - * When "git push" triggered the automatic gc on the receiving end, a - message from "git prune" that said it was removing cruft leaked to - the standard output, breaking the communication protocol. - (merge 4b7f2fa bc/receive-pack-stdout-protection later to maint). - - * "git diff" had a confusion between taking data from a path in the - working tree and taking data from an object that happens to have - name 0{40} recorded in a tree. - (merge c479d14 jk/maint-null-in-trees later to maint). - - * The output from "git diff -B" for a file that ends with an - incomplete line did not put "\ No newline..." on a line of its own. - - * "git send-email" did not unquote encoded words that appear on the - header correctly, and lost "_" from strings. - (merge b622d4d tr/maint-send-email-2047 later to maint). - - * When the user gives an argument that can be taken as both a - revision name and a pathname without disambiguating with "--", we - used to give a help message "Use '--' to separate". The message - has been clarified to show where that '--' goes on the command - line. - (merge 4d4b573 mm/die-with-dashdash-help later to maint). - - * "gitweb" when used with PATH_INFO failed to notice directories with - SP (and other characters that need URL-style quoting) in them. - (merge cacfc09 js/gitweb-path-info-unquote later to maint). + (merge 6183749 sb/send-email-reconfirm-fix later to maint). diff --git a/Documentation/config.txt b/Documentation/config.txt index 6416cae511..11f320b962 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -559,8 +559,9 @@ core.whitespace:: * `space-before-tab` treats a space character that appears immediately before a tab character in the initial indent part of the line as an error (enabled by default). -* `indent-with-non-tab` treats a line that is indented with 8 or more - space characters as an error (not enabled by default). +* `indent-with-non-tab` treats a line that is indented with space + characters instead of the equivalent tabs as an error (not enabled by + default). * `tab-in-indent` treats a tab character in the initial indent part of the line as an error (not enabled by default). * `blank-at-eof` treats blank lines added at the end of file as an error diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 47235bea04..9c1d2f1781 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -13,6 +13,8 @@ SYNOPSIS [--column[=<options>] | --no-column] [(--merged | --no-merged | --contains) [<commit>]] [<pattern>...] 'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>] +'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>] +'git branch' --unset-upstream [<branchname>] 'git branch' (-m | -M) [<oldbranch>] <newbranch> 'git branch' (-d | -D) [-r] <branchname>... 'git branch' --edit-description [<branchname>] @@ -48,7 +50,7 @@ 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 overridden by using the `--track` and `--no-track` options, and -changed later using `git branch --set-upstream`. +changed later using `git branch --set-upstream-to`. With a `-m` or `-M` option, <oldbranch> will be renamed to <newbranch>. If <oldbranch> had a corresponding reflog, it is renamed to match @@ -173,6 +175,16 @@ start-point is either a local or remote-tracking branch. like `--track` would when creating the branch, except that where branch points to is not changed. +-u <upstream>:: +--set-upstream-to=<upstream>:: + Set up <branchname>'s tracking information so <upstream> is + considered <branchname>'s upstream branch. If no <branchname> + is specified, then it defaults to the current branch. + +--unset-upstream:: + Remove the upstream information for <branchname>. If no branch + is specified it defaults to the current branch. + --edit-description:: Open an editor and edit the text to explain what the branch is for, to be used by various other commands (e.g. `request-pull`). diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 11cc7f0588..7958a47006 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -367,6 +367,18 @@ $ git checkout hello.c <3> <2> take a file out of another commit <3> restore hello.c from the index + +If you want to check out _all_ C source files out of the index, +you can say ++ +------------ +$ git checkout -- '*.c' +------------ ++ +Note the quotes around `*.c`. The file `hello.c` will also be +checked out, even though it is no longer in the working tree, +because the file globbing is used to match entries in the index +(not in the working tree by the shell). ++ If you have an unfortunate branch that is named `hello.c`, this step would be confused as an instruction to switch to that branch. You should instead write: diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 4622297ec9..9594ac8e9d 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -389,8 +389,10 @@ DISCUSSION 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. -Tools that turn commits into email, for example, use the first line -on the Subject: line and the rest of the commit in the body. +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 commit into email, and it uses +the title on the Subject line and the rest of the commit in the body. include::i18n.txt[] diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2620d28b4b..6603a7ab73 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -39,6 +39,10 @@ OPTIONS 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. + --force:: Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does @@ -1047,7 +1051,9 @@ done:: Error out if the stream ends without a 'done' command. Without this feature, errors causing the frontend to end abruptly at a convenient point in the stream can go - undetected. + undetected. This may occur, for example, if an import + front end dies in mid-operation without emitting SIGTERM + or SIGKILL at its subordinate git fast-import instance. `option` ~~~~~~~~ diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index 15e7ac80c0..e2301f5c01 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -304,6 +304,11 @@ committed a merge between P1 and P2, it will be propagated properly and all children of the merge will become merge commits with P1,P2 as their parents instead of the merge commit. +*NOTE* the changes introduced by the commits, and which are not reverted +by subsequent commits, will still be in the rewritten branch. If you want +to throw out _changes_ together with the commits, you should use the +interactive mode of 'git rebase'. + You can rewrite the commit log messages using `--msg-filter`. For example, 'git svn-id' strings in a repository created by 'git svn' can be removed this way: @@ -314,11 +319,6 @@ git filter-branch --msg-filter ' ' ------------------------------------------------------- -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 -will print. - If you need to add 'Acked-by' lines to, say, the last 10 commits (none of which is a merge), use this command: @@ -329,11 +329,10 @@ git filter-branch --msg-filter ' ' HEAD~10..HEAD -------------------------------------------------------- -*NOTE* the changes introduced by the commits, and which are not reverted -by subsequent commits, will still be in the rewritten branch. If you want -to throw out _changes_ together with the commits, you should use the -interactive mode of 'git rebase'. - +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 +will print. Consider this history: diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index c872b883ba..db55a4e0bb 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -102,9 +102,10 @@ Fields that have name-email-date tuple as its value (`author`, and `date` to extract the named component. The complete message in a commit and tag object is `contents`. -Its first line is `contents:subject`, the remaining lines -are `contents:body` and the optional GPG signature -is `contents:signature`. +Its first line is `contents:subject`, where subject is the concatenation +of all lines of the commit message up to the first blank line. The next +line is 'contents:body', where body is all of the lines after the first +blank line. Finally, the optional GPG signature is `contents:signature`. For sorting purposes, fields with numeric values sort in numeric order (`objectsize`, `authordate`, `committerdate`, `taggerdate`). diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 04c7346e3e..6d43f56279 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -58,10 +58,13 @@ output, unless the `--stdout` option is specified. If `-o` is specified, output files are created in <dir>. Otherwise they are created in the current working directory. -By default, the subject of a single patch is "[PATCH] First Line" and -the subject when multiple patches are output is "[PATCH n/m] First -Line". To force 1/1 to be added for a single patch, use `-n`. To omit -patch numbers from the subject, use `-N`. +By default, the subject of a single patch is "[PATCH] " followed by +the concatenation of lines from the commit message up to the first blank +line (see the DISCUSSION section of linkgit:git-commit[1]). + +When multiple patches are output, the subject prefix will instead be +"[PATCH n/m] ". To force 1/1 to be added for a single patch, use `-n`. +To omit patch numbers from the subject, use `-N`. If given `--thread`, `git-format-patch` will generate `In-Reply-To` and `References` headers to make the second and subsequent patch mails appear diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 1f906208f9..585dac40ba 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -24,10 +24,6 @@ each commit introduces are shown. OPTIONS ------- --<n>:: - Limits the number of commits to show. - Note that this is a commit limiting option, see below. - <since>..<until>:: Show only commits between the named two commits. When either <since> or <until> is omitted, it defaults to @@ -137,6 +133,8 @@ Examples This makes sense only when following a strict policy of merging all topic branches when staying on a single integration branch. +`git log -3`:: + Limits the number of commits to show to 3. Discussion ---------- diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt index 7a9b86a58a..774de5e9d9 100644 --- a/Documentation/git-ls-remote.txt +++ b/Documentation/git-ls-remote.txt @@ -42,6 +42,11 @@ OPTIONS it successfully talked with the remote repository, whether it found any matching refs. +--get-url:: + Expand the URL of the given remote repository taking into account any + "url.<base>.insteadOf" config setting (See linkgit:git-config[1]) and + exit without talking to the remote. + <repository>:: Location of the repository. The shorthand defined in $GIT_DIR/branches/ can be used. Use "." (dot) to list references in diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt index b295bf8330..87842e33f8 100644 --- a/Documentation/git-merge-base.txt +++ b/Documentation/git-merge-base.txt @@ -11,6 +11,7 @@ SYNOPSIS [verse] 'git merge-base' [-a|--all] <commit> <commit>... 'git merge-base' [-a|--all] --octopus <commit>... +'git merge-base' --is-ancestor <commit> <commit> 'git merge-base' --independent <commit>... DESCRIPTION @@ -50,6 +51,12 @@ from linkgit:git-show-branch[1] when used with the `--merge-base` option. from any other. This mimics the behavior of 'git show-branch --independent'. +--is-ancestor:: + Check if the first <commit> is an ancestor of the second <commit>, + and exit with status 0 if true, or with status 1 if not. + Errors are signaled by a non-zero status that is not 1. + + OPTIONS ------- -a:: @@ -110,6 +117,27 @@ both '1' and '2' are merge-bases of A and B. Neither one is better than the other (both are 'best' merge bases). When the `--all` option is not given, it is unspecified which best one is output. +A common idiom to check "fast-forward-ness" between two commits A +and B is (or at least used to be) to compute the merge base between +A and B, and check if it is the same as A, in which case, A is an +ancestor of B. You will see this idiom used often in older scripts. + + A=$(git rev-parse --verify A) + if test "$A" = "$(git merge-base A B)" + then + ... A is an ancestor of B ... + fi + +In modern git, you can say this in a more direct way: + + if git merge-base --is-ancestor A B + then + ... A is an ancestor of B ... + fi + +instead. + + See also -------- linkgit:git-rev-list[1], diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index 8228f33e3f..beff6229c8 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -163,7 +163,7 @@ All commands except clone accept these options. --git-dir <dir>:: Set the 'GIT_DIR' environment variable. See linkgit:git[1]. ---verbose:: +--verbose, -v:: Provide more progress information. Sync options @@ -269,6 +269,24 @@ These options can be used to modify 'git p4 submit' behavior. 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. + +--prepare-p4-only:: + Apply a commit to the p4 workspace, opening, adding and deleting + files in p4 as for a normal submit operation. Do not issue the + final "p4 submit", but instead print a message about how to + submit manually or revert. This option always stops after the + first (oldest) commit. Git tags are not exported to p4. + +--conflict=(ask|skip|quit):: + Conflicts can occur when applying a commit to p4. When this + happens, the default behavior ("ask") is to prompt whether to + skip this commit and continue, or quit. This option can be used + to bypass the prompt, causing conflicting commits to be automatically + skipped, or to quit trying to apply commits, without prompting. + Rebase options ~~~~~~~~~~~~~~ These options can be used to modify 'git p4 rebase' behavior. @@ -519,6 +537,10 @@ git-p4.labelExportRegexp:: Only p4 labels matching this regular expression will be exported. The default value is '[a-zA-Z0-9_\-.]+$'. +git-p4.conflict:: + Specify submit behavior when a conflict with p4 is found, as per + --conflict. The default behavior is 'ask'. + IMPLEMENTATION DETAILS ---------------------- * Changesets from p4 are imported using git fast-import. diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt index a308f4c79f..e8c396b5f9 100644 --- a/Documentation/git-remote.txt +++ b/Documentation/git-remote.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git remote' [-v | --verbose] 'git remote add' [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url> 'git remote rename' <old> <new> -'git remote rm' <name> +'git remote remove' <name> 'git remote set-head' <name> (-a | -d | <branch>) 'git remote set-branches' [--add] <name> <branch>... 'git remote set-url' [--push] <name> <newurl> [<oldurl>] @@ -85,6 +85,7 @@ In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the configuration file format. +'remove':: 'rm':: Remove the remote named <name>. All remote-tracking branches and diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index 01d8417316..afeb4cdf16 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -14,8 +14,7 @@ git log --pretty=short | 'git shortlog' [-h] [-n] [-s] [-e] [-w] DESCRIPTION ----------- Summarizes 'git log' output in a format suitable for inclusion -in release announcements. Each commit will be grouped by author and -the first line of the commit message will be shown. +in release announcements. Each commit will be grouped by author and title. Additionally, "[PATCH]" will be stripped from the commit description. diff --git a/Documentation/git.txt b/Documentation/git.txt index 463d567a87..6710cb0a41 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -43,14 +43,17 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.12/git.html[documentation for release 1.7.12] +* link:v1.7.12.1/git.html[documentation for release 1.7.12.1] * release notes for + link:RelNotes/1.7.12.1.txt[1.7.12.1], link:RelNotes/1.7.12.txt[1.7.12]. -* link:v1.7.11.5/git.html[documentation for release 1.7.11.5] +* link:v1.7.11.7/git.html[documentation for release 1.7.11.7] * release notes for + link:RelNotes/1.7.11.7.txt[1.7.11.7], + link:RelNotes/1.7.11.6.txt[1.7.11.6], link:RelNotes/1.7.11.5.txt[1.7.11.5], link:RelNotes/1.7.11.4.txt[1.7.11.4], link:RelNotes/1.7.11.3.txt[1.7.11.3], diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index e16f3e175b..462b79c120 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -927,7 +927,7 @@ file at the toplevel (i.e. not in any subdirectory). The built-in macro attribute "binary" is equivalent to: ------------ -[attr]binary -diff -text +[attr]binary -diff -merge -text ------------ diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 3e72a5d68e..f6ba90c2da 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -37,11 +37,28 @@ arguments. Here are the rules: 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 disambiguate. - ++ When writing a script that is expected to handle random user-input, it is a good practice to make it explicit which arguments are which by placing disambiguating `--` at appropriate places. + * Many commands allow wildcards in paths, but you need to protect + them from getting globbed by the shell. These two mean different + things: ++ +-------------------------------- +$ git checkout -- *.c +$ git checkout -- \*.c +-------------------------------- ++ +The former lets your shell expand the fileglob, and you are asking +the dot-C files in your working tree to be overwritten with the version +in the index. The latter passes the `*.c` to Git, and you are asking +the paths in the index that match the pattern to be checked out to your +working tree. After running `git add hello.c; rm hello.c`, you will _not_ +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: diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 9d893369a0..5325c5a7d5 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -956,12 +956,11 @@ $ git show-branch --topo-order --more=1 master mybranch ------------------------------------------------ The first two lines indicate that it is showing the two branches -and the first line of the commit log message from their -top-of-the-tree commits, you are currently on `master` branch -(notice the asterisk `*` character), and the first column for -the later output lines is used to show commits contained in the +with the titles of their top-of-the-tree commits, you are currently on +`master` branch (notice the asterisk `*` character), and the first +column for the later output lines is used to show commits contained in the `master` branch, and the second column for the `mybranch` -branch. Three commits are shown along with their log messages. +branch. Three commits are shown along with their titles. All of them have non blank characters in the first column (`*` shows an ordinary commit on the current branch, `-` is a merge commit), which means they are now part of the `master` branch. Only the "Some diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index dee050567e..f1cb6f3be6 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -139,9 +139,11 @@ them to the index, and commit, all in one step. A note on commit messages: 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. Tools that turn commits into email, for -example, use the first line on the Subject: line and the rest of the -commit in the body. +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 +commit into email, and it uses the title on the Subject line and the +rest of the commit in the body. Git tracks content not files ---------------------------- diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index 595a3cf1a7..66db80296f 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -32,13 +32,14 @@ ours;; This option forces conflicting hunks to be auto-resolved cleanly by favoring 'our' version. Changes from the other tree that do not conflict with our side are reflected to the merge result. + For a binary file, the entire contents are taken from our side. + This should not be confused with the 'ours' merge strategy, which does not even look at what the other tree contains at all. It discards everything the other tree did, declaring 'our' history contains all that happened in it. theirs;; - This is opposite of 'ours'. + This is the opposite of 'ours'. patience;; With this option, 'merge-recursive' spends a little extra time diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index e3d8a83b23..d9eddedc72 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -130,6 +130,9 @@ The placeholders are: - '%b': body - '%B': raw body (unwrapped subject and body) - '%N': commit notes +- '%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 - '%gD': reflog selector, e.g., `refs/stash@{1}` - '%gd': shortened reflog selector, e.g., `stash@{1}` - '%gn': reflog identity name diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt index 2a3dc8664f..5e499421a4 100644 --- a/Documentation/pretty-options.txt +++ b/Documentation/pretty-options.txt @@ -66,3 +66,7 @@ being displayed. Examples: "--notes=foo" will show only notes from --[no-]standard-notes:: These options are deprecated. Use the above --notes/--no-notes options instead. + +--show-signature:: + Check the validity of a signed commit object by passing the signature + to `gpg --verify` and show the output. diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index def1340ac7..1fc2a18404 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -3,12 +3,20 @@ Commit Limiting Besides specifying a range of commits that should be listed using the special notations explained in the description, additional commit -limiting may be applied. Note that they are applied before commit -ordering and formatting options, such as '--reverse'. +limiting may be applied. + +Using more options generally further limits the output (e.g. +`--since=<date1>` limits to commits newer than `<date1>`, and using it +with `--grep=<pattern>` further limits to commits whose log message +has a line that matches `<pattern>`), unless otherwise noted. + +Note that these are applied before commit +ordering and formatting options, such as `--reverse`. -- --n 'number':: +-<number>:: +-n <number>:: --max-count=<number>:: Limit the number of commits to output. @@ -38,16 +46,22 @@ endif::git-rev-list[] --committer=<pattern>:: Limit the commits output to ones with author/committer - header lines that match the specified pattern (regular expression). + header lines that match the specified pattern (regular + expression). With more than one `--author=<pattern>`, + commits whose author matches any of the given patterns are + chosen (similarly for multiple `--committer=<pattern>`). --grep=<pattern>:: Limit the commits output to ones with log message that - matches the specified pattern (regular expression). + matches the specified pattern (regular expression). With + more than one `--grep=<pattern>`, commits whose message + matches any of the given patterns are chosen (but see + `--all-match`). --all-match:: Limit the commits output to ones that match all given --grep, - --author and --committer instead of ones that match at least one. + instead of ones that match at least one. -i:: --regexp-ignore-case:: @@ -636,10 +650,14 @@ These options are mostly targeted for packing of git repositories. Only useful with '--objects'; print the object IDs that are not in packs. ---no-walk:: +--no-walk[=(sorted|unsorted)]:: - Only show the given revs, but do not traverse their ancestors. - This has no effect if a range is specified. + Only show the given commits, but do not traverse their ancestors. + This has no effect if a range is specified. If the argument + "unsorted" is given, the commits are show in the order they were + given on the command line. Otherwise (if "sorted" or no argument + was given), the commits are show in reverse chronological order + by commit time. --do-walk:: diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt index 1b7d8f140c..1a797812fb 100644 --- a/Documentation/technical/api-argv-array.txt +++ b/Documentation/technical/api-argv-array.txt @@ -46,6 +46,10 @@ Functions Format a string and push it onto the end of the array. This is a convenience wrapper combining `strbuf_addf` and `argv_array_push`. +`argv_array_pop`:: + Remove the final element from the array. If there are no + elements in the array, do nothing. + `argv_array_clear`:: Free all memory associated with the array and return it to the initial, empty state. diff --git a/Documentation/technical/api-sha1-array.txt b/Documentation/technical/api-sha1-array.txt index 4a4bae8109..45d1c517cd 100644 --- a/Documentation/technical/api-sha1-array.txt +++ b/Documentation/technical/api-sha1-array.txt @@ -25,9 +25,6 @@ Functions the array (but note that some operations below may lose this ordering). -`sha1_array_sort`:: - Sort the elements in the array. - `sha1_array_lookup`:: Perform a binary search of the array for a specific sha1. If found, returns the offset (in number of elements) of the diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt index 49cdc571cd..d51e20f352 100644 --- a/Documentation/technical/pack-protocol.txt +++ b/Documentation/technical/pack-protocol.txt @@ -259,8 +259,10 @@ a positive depth, this step is skipped. ---- If the client has requested a positive depth, the server will compute -the set of commits which are no deeper than the desired depth, starting -at the client's wants. The server writes 'shallow' lines for each +the set of commits which are no deeper than the desired depth. The set +of commits start at the client's wants. + +The server writes 'shallow' lines for each commit whose parents will not be sent as a result. The server writes an 'unshallow' line for each commit which the client has indicated is shallow, but is no longer shallow at the currently requested depth diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 03d95dc290..85651b57ae 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1136,9 +1136,12 @@ Creating good commit messages 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. Tools that turn commits into email, for example, use -the first line on the Subject line and the rest of the commit in the -body. +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 +commit into email, and it uses the title on the Subject line and the +rest of the commit in the body. + [[ignoring-files]] Ignoring files @@ -90,6 +90,8 @@ all:: # # Define NO_MKDTEMP if you don't have mkdtemp in the C library. # +# Define MKDIR_WO_TRAILING_SLASH if your mkdir() can't deal with trailing slash. +# # 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. @@ -157,6 +159,11 @@ all:: # Define NO_PREAD if you have a problem with pread() system call (e.g. # cygwin1.dll before v1.5.22). # +# Define NO_SETITIMER if you don't have setitimer() +# +# Define NO_STRUCT_ITIMERVAL if you don't have struct itimerval +# This also implies NO_SETITIMER +# # Define NO_THREAD_SAFE_PREAD if your pread() implementation is not # thread-safe. (e.g. compat/pread.c or cygwin) # @@ -496,6 +503,7 @@ TEST_PROGRAMS_NEED_X += test-mergesort TEST_PROGRAMS_NEED_X += test-mktemp TEST_PROGRAMS_NEED_X += test-parse-options TEST_PROGRAMS_NEED_X += test-path-utils +TEST_PROGRAMS_NEED_X += test-regex TEST_PROGRAMS_NEED_X += test-revision-walking TEST_PROGRAMS_NEED_X += test-run-command TEST_PROGRAMS_NEED_X += test-scrap-cache-tree @@ -1640,6 +1648,10 @@ ifdef NO_MKDTEMP COMPAT_CFLAGS += -DNO_MKDTEMP COMPAT_OBJS += compat/mkdtemp.o endif +ifdef MKDIR_WO_TRAILING_SLASH + COMPAT_CFLAGS += -DMKDIR_WO_TRAILING_SLASH + COMPAT_OBJS += compat/mkdir.o +endif ifdef NO_MKSTEMPS COMPAT_CFLAGS += -DNO_MKSTEMPS endif @@ -1671,6 +1683,13 @@ endif ifdef OBJECT_CREATION_USES_RENAMES COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1 endif +ifdef NO_STRUCT_ITIMERVAL + COMPAT_CFLAGS += -DNO_STRUCT_ITIMERVAL + NO_SETITIMER=YesPlease +endif +ifdef NO_SETITIMER + COMPAT_CFLAGS += -DNO_SETITIMER +endif ifdef NO_PREAD COMPAT_CFLAGS += -DNO_PREAD COMPAT_OBJS += compat/pread.o @@ -35,6 +35,9 @@ const char *real_path(const char *path) if (path == buf || path == next_buf) return path; + if (!*path) + die("The empty string is not a valid path"); + if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX) die ("Too long path: %.*s", 60, path); @@ -42,8 +45,8 @@ const char *real_path(const char *path) if (!is_directory(buf)) { char *last_slash = find_last_dir_sep(buf); if (last_slash) { - *last_slash = '\0'; last_elem = xstrdup(last_slash + 1); + last_slash[1] = '\0'; } else { last_elem = xstrdup(buf); *buf = '\0'; @@ -123,7 +126,9 @@ const char *absolute_path(const char *path) { static char buf[PATH_MAX + 1]; - if (is_absolute_path(path)) { + if (!*path) { + die("The empty string is not a valid path"); + } else if (is_absolute_path(path)) { if (strlcpy(buf, path, PATH_MAX) >= PATH_MAX) die("Too long path: %.*s", 60, path); } else { diff --git a/argv-array.c b/argv-array.c index 0b5f8898a1..256741d226 100644 --- a/argv-array.c +++ b/argv-array.c @@ -49,12 +49,21 @@ void argv_array_pushl(struct argv_array *array, ...) va_end(ap); } +void argv_array_pop(struct argv_array *array) +{ + if (!array->argc) + return; + free((char *)array->argv[array->argc - 1]); + array->argv[array->argc - 1] = NULL; + array->argc--; +} + void argv_array_clear(struct argv_array *array) { if (array->argv != empty_argv) { int i; for (i = 0; i < array->argc; i++) - free((char **)array->argv[i]); + free((char *)array->argv[i]); free(array->argv); } argv_array_init(array); diff --git a/argv-array.h b/argv-array.h index b93a69c36c..f4b98660f8 100644 --- a/argv-array.h +++ b/argv-array.h @@ -16,6 +16,7 @@ void argv_array_push(struct argv_array *, const char *); __attribute__((format (printf,2,3))) void argv_array_pushf(struct argv_array *, const char *fmt, ...); void argv_array_pushl(struct argv_array *, ...); +void argv_array_pop(struct argv_array *); void argv_array_clear(struct argv_array *); #endif /* ARGV_ARRAY_H */ @@ -306,7 +306,7 @@ static void free_attr_elem(struct attr_stack *e) } static const char *builtin_attr[] = { - "[attr]binary -diff -text", + "[attr]binary -diff -merge -text", NULL, }; @@ -353,7 +353,7 @@ static struct attr_stack *read_attr_from_file(const char *path, int macro_ok) int lineno = 0; if (!fp) { - if (errno != ENOENT) + if (errno != ENOENT && errno != ENOTDIR) warn_on_inaccessible(path); return NULL; } @@ -833,7 +833,7 @@ static int check_ancestors(const char *prefix) */ static void check_good_are_ancestors_of_bad(const char *prefix, int no_checkout) { - char *filename = xstrdup(git_path("BISECT_ANCESTORS_OK")); + char *filename = git_pathdup("BISECT_ANCESTORS_OK"); struct stat st; int fd; @@ -21,7 +21,6 @@ struct fmt_merge_msg_opts { extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out, struct fmt_merge_msg_opts *); -extern void commit_notes(struct notes_tree *t, const char *msg); struct notes_rewrite_cfg { struct notes_tree **trees; @@ -33,7 +32,6 @@ struct notes_rewrite_cfg { int mode_from_env; }; -combine_notes_fn parse_combine_notes_fn(const char *v); struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd); int copy_note_for_rewrite(struct notes_rewrite_cfg *c, const unsigned char *from_obj, const unsigned char *to_obj); diff --git a/builtin/add.c b/builtin/add.c index 2816789b9d..e664100c71 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -260,7 +260,7 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch) static int edit_patch(int argc, const char **argv, const char *prefix) { - char *file = xstrdup(git_path("ADD_EDIT.patch")); + char *file = git_pathdup("ADD_EDIT.patch"); const char *apply_argv[] = { "apply", "--recount", "--cached", NULL, NULL }; struct child_process child; @@ -303,6 +303,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix) die (_("Could not apply '%s'"), file); unlink(file); + free(file); return 0; } diff --git a/builtin/blame.c b/builtin/blame.c index 0e102bf2c2..c27ef21c23 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2069,6 +2069,55 @@ static int git_blame_config(const char *var, const char *value, void *cb) return git_default_config(var, value, cb); } +static void verify_working_tree_path(struct commit *work_tree, const char *path) +{ + struct commit_list *parents; + + for (parents = work_tree->parents; parents; parents = parents->next) { + const unsigned char *commit_sha1 = parents->item->object.sha1; + unsigned char blob_sha1[20]; + unsigned mode; + + if (!get_tree_entry(commit_sha1, path, blob_sha1, &mode) && + sha1_object_info(blob_sha1, NULL) == OBJ_BLOB) + return; + } + die("no such path '%s' in HEAD", path); +} + +static struct commit_list **append_parent(struct commit_list **tail, const unsigned char *sha1) +{ + struct commit *parent; + + parent = lookup_commit_reference(sha1); + if (!parent) + die("no such commit %s", sha1_to_hex(sha1)); + return &commit_list_insert(parent, tail)->next; +} + +static void append_merge_parents(struct commit_list **tail) +{ + int merge_head; + const char *merge_head_file = git_path("MERGE_HEAD"); + struct strbuf line = STRBUF_INIT; + + merge_head = open(merge_head_file, O_RDONLY); + if (merge_head < 0) { + if (errno == ENOENT) + return; + die("cannot open '%s' for reading", merge_head_file); + } + + while (!strbuf_getwholeline_fd(&line, merge_head, '\n')) { + unsigned char sha1[20]; + if (line.len < 40 || get_sha1_hex(line.buf, sha1)) + die("unknown line in '%s': %s", merge_head_file, line.buf); + tail = append_parent(tail, sha1); + } + close(merge_head); + strbuf_release(&line); +} + /* * Prepare a dummy commit that represents the work tree (or staged) item. * Note that annotating work tree item never works in the reverse. @@ -2079,6 +2128,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, { struct commit *commit; struct origin *origin; + struct commit_list **parent_tail, *parent; unsigned char head_sha1[20]; struct strbuf buf = STRBUF_INIT; const char *ident; @@ -2086,20 +2136,38 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, int size, len; struct cache_entry *ce; unsigned mode; - - if (get_sha1("HEAD", head_sha1)) - die("No such ref: HEAD"); + struct strbuf msg = STRBUF_INIT; time(&now); commit = xcalloc(1, sizeof(*commit)); - commit->parents = xcalloc(1, sizeof(*commit->parents)); - commit->parents->item = lookup_commit_reference(head_sha1); commit->object.parsed = 1; commit->date = now; commit->object.type = OBJ_COMMIT; + parent_tail = &commit->parents; + + if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL)) + die("no such ref: HEAD"); + + parent_tail = append_parent(parent_tail, head_sha1); + append_merge_parents(parent_tail); + verify_working_tree_path(commit, path); origin = make_origin(commit, path); + ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0); + strbuf_addstr(&msg, "tree 0000000000000000000000000000000000000000\n"); + for (parent = commit->parents; parent; parent = parent->next) + strbuf_addf(&msg, "parent %s\n", + sha1_to_hex(parent->item->object.sha1)); + strbuf_addf(&msg, + "author %s\n" + "committer %s\n\n" + "Version of %s from %s\n", + ident, ident, path, + (!contents_from ? path : + (!strcmp(contents_from, "-") ? "standard input" : contents_from))); + commit->buffer = strbuf_detach(&msg, NULL); + if (!contents_from || strcmp("-", contents_from)) { struct stat st; const char *read_from; @@ -2136,7 +2204,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, } else { /* Reading from stdin */ - contents_from = "standard input"; mode = 0; if (strbuf_read(&buf, 0, 0) < 0) die_errno("failed to read from stdin"); @@ -2181,16 +2248,6 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt, */ cache_tree_invalidate_path(active_cache_tree, path); - commit->buffer = xmalloc(400); - ident = fmt_ident("Not Committed Yet", "not.committed.yet", NULL, 0); - snprintf(commit->buffer, 400, - "tree 0000000000000000000000000000000000000000\n" - "parent %s\n" - "author %s\n" - "committer %s\n\n" - "Version of %s from %s\n", - sha1_to_hex(head_sha1), - ident, ident, path, contents_from ? contents_from : path); return commit; } diff --git a/builtin/branch.c b/builtin/branch.c index 297be4ec40..ffd26849c7 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -130,7 +130,7 @@ static int branch_merged(int kind, const char *name, if (!reference_rev) reference_rev = head_rev; - merged = in_merge_bases(rev, &reference_rev, 1); + merged = in_merge_bases(rev, reference_rev); /* * After the safety valve is fully redefined to "check with @@ -140,7 +140,7 @@ static int branch_merged(int kind, const char *name, * a gentle reminder is in order. */ if ((head_rev != reference_rev) && - in_merge_bases(rev, &head_rev, 1) != merged) { + in_merge_bases(rev, head_rev) != merged) { if (merged) warning(_("deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD."), @@ -197,7 +197,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds, free(name); - name = xstrdup(mkpath(fmt, bname.buf)); + name = mkpathdup(fmt, bname.buf); if (read_ref(name, sha1)) { error(remote_branch ? _("remote branch '%s' not found.") @@ -714,7 +714,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) int delete = 0, rename = 0, force_create = 0, list = 0; int verbose = 0, abbrev = -1, detached = 0; int reflog = 0, edit_description = 0; - int quiet = 0; + int quiet = 0, unset_upstream = 0; + const char *new_upstream = NULL; enum branch_track track; int kinds = REF_LOCAL_BRANCH; struct commit_list *with_commit = NULL; @@ -728,6 +729,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix) BRANCH_TRACK_EXPLICIT), OPT_SET_INT( 0, "set-upstream", &track, N_("change upstream info"), BRANCH_TRACK_OVERRIDE), + OPT_STRING('u', "set-upstream-to", &new_upstream, "upstream", "change the upstream info"), + OPT_BOOLEAN(0, "unset-upstream", &unset_upstream, "Unset the upstream info"), OPT__COLOR(&branch_use_color, N_("use colored output")), OPT_SET_INT('r', "remotes", &kinds, N_("act on remote-tracking branches"), REF_REMOTE_BRANCH), @@ -796,10 +799,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, builtin_branch_usage, 0); - if (!delete && !rename && !edit_description && argc == 0) + if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) list = 1; - if (!!delete + !!rename + !!force_create + !!list > 1) + if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1) usage_with_options(builtin_branch_usage, options); if (abbrev == -1) @@ -854,11 +857,62 @@ int cmd_branch(int argc, const char **argv, const char *prefix) rename_branch(argv[0], argv[1], rename > 1); else usage_with_options(builtin_branch_usage, options); + } else if (new_upstream) { + struct branch *branch = branch_get(argv[0]); + + if (!ref_exists(branch->refname)) + die(_("branch '%s' does not exist"), branch->name); + + /* + * create_branch takes care of setting up the tracking + * info and making sure new_upstream is correct + */ + create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); + } else if (unset_upstream) { + struct branch *branch = branch_get(argv[0]); + struct strbuf buf = STRBUF_INIT; + + if (!branch_has_merge_config(branch)) { + die(_("Branch '%s' has no upstream information"), branch->name); + } + + strbuf_addf(&buf, "branch.%s.remote", branch->name); + git_config_set_multivar(buf.buf, NULL, NULL, 1); + strbuf_reset(&buf); + strbuf_addf(&buf, "branch.%s.merge", branch->name); + git_config_set_multivar(buf.buf, NULL, NULL, 1); + strbuf_release(&buf); } else if (argc > 0 && argc <= 2) { + struct branch *branch = branch_get(argv[0]); + int branch_existed = 0, remote_tracking = 0; + struct strbuf buf = STRBUF_INIT; + if (kinds != REF_LOCAL_BRANCH) die(_("-a and -r options to 'git branch' do not make sense with a branch name")); + + if (track == BRANCH_TRACK_OVERRIDE) + fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n")); + + strbuf_addf(&buf, "refs/remotes/%s", branch->name); + remote_tracking = ref_exists(buf.buf); + strbuf_release(&buf); + + branch_existed = ref_exists(branch->refname); create_branch(head, argv[0], (argc == 2) ? argv[1] : head, force_create, reflog, 0, quiet, track); + + /* + * We only show the instructions if the user gave us + * one branch which doesn't exist locally, but is the + * name of a remote-tracking branch. + */ + if (argc == 1 && track == BRANCH_TRACK_OVERRIDE && + !branch_existed && remote_tracking) { + fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name); + fprintf(stderr, _(" git branch -d %s\n"), branch->name); + fprintf(stderr, _(" git branch --set-upstream-to %s\n"), branch->name); + } + } else usage_with_options(builtin_branch_usage, options); diff --git a/builtin/check-attr.c b/builtin/check-attr.c index e1ff575daa..075d01d30c 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -9,7 +9,7 @@ static int cached_attrs; static int stdin_paths; static const char * const check_attr_usage[] = { N_("git check-attr [-a | --all | attr...] [--] pathname..."), -N_("git check-attr --stdin [-a | --all | attr...] < <list-of-paths>"), +N_("git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>"), NULL }; diff --git a/builtin/checkout.c b/builtin/checkout.c index d287ee6e48..781295b2c9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -28,23 +28,25 @@ static const char * const checkout_usage[] = { }; struct checkout_opts { + int patch_mode; int quiet; int merge; int force; int force_detach; int writeout_stage; - int writeout_error; int overwrite_ignore; - /* not set by parse_options */ - int branch_exists; - const char *new_branch; const char *new_branch_force; const char *new_orphan_branch; int new_branch_log; enum branch_track track; struct diff_options diff_options; + + int branch_exists; + const char *prefix; + const char **pathspec; + struct tree *source_tree; }; static int post_checkout_hook(struct commit *old, struct commit *new, @@ -215,8 +217,8 @@ static int checkout_merged(int pos, struct checkout *state) return status; } -static int checkout_paths(struct tree *source_tree, const char **pathspec, - const char *prefix, struct checkout_opts *opts) +static int checkout_paths(const struct checkout_opts *opts, + const char *revision) { int pos; struct checkout state; @@ -228,37 +230,65 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, int stage = opts->writeout_stage; int merge = opts->merge; int newfd; - struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); + struct lock_file *lock_file; + + if (opts->track != BRANCH_TRACK_UNSPECIFIED) + die(_("'%s' cannot be used with updating paths"), "--track"); + + if (opts->new_branch_log) + die(_("'%s' cannot be used with updating paths"), "-l"); + + if (opts->force && opts->patch_mode) + die(_("'%s' cannot be used with updating paths"), "-f"); + + if (opts->force_detach) + die(_("'%s' cannot be used with updating paths"), "--detach"); + + if (opts->merge && opts->patch_mode) + die(_("'%s' cannot be used with %s"), "--merge", "--patch"); + + if (opts->force && opts->merge) + die(_("'%s' cannot be used with %s"), "-f", "-m"); + + if (opts->new_branch) + die(_("Cannot update paths and switch to branch '%s' at the same time."), + opts->new_branch); + + if (opts->patch_mode) + return run_add_interactive(revision, "--patch=checkout", + opts->pathspec); + + lock_file = xcalloc(1, sizeof(struct lock_file)); newfd = hold_locked_index(lock_file, 1); - if (read_cache_preload(pathspec) < 0) + if (read_cache_preload(opts->pathspec) < 0) return error(_("corrupt index file")); - if (source_tree) - read_tree_some(source_tree, pathspec); + if (opts->source_tree) + read_tree_some(opts->source_tree, opts->pathspec); - for (pos = 0; pathspec[pos]; pos++) + for (pos = 0; opts->pathspec[pos]; pos++) ; ps_matched = xcalloc(1, pos); for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - if (source_tree && !(ce->ce_flags & CE_UPDATE)) + if (opts->source_tree && !(ce->ce_flags & CE_UPDATE)) continue; - match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, ps_matched); + match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, ps_matched); } - if (report_path_error(ps_matched, pathspec, prefix)) + if (report_path_error(ps_matched, opts->pathspec, opts->prefix)) return 1; /* "checkout -m path" to recreate conflicted state */ if (opts->merge) - unmerge_cache(pathspec); + unmerge_cache(opts->pathspec); /* Any unmerged paths? */ for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - if (match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) { + if (match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) { if (!ce_stage(ce)) continue; if (opts->force) { @@ -283,9 +313,9 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, state.refresh_cache = 1; for (pos = 0; pos < active_nr; pos++) { struct cache_entry *ce = active_cache[pos]; - if (source_tree && !(ce->ce_flags & CE_UPDATE)) + if (opts->source_tree && !(ce->ce_flags & CE_UPDATE)) continue; - if (match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) { + if (match_pathspec(opts->pathspec, ce->name, ce_namelen(ce), 0, NULL)) { if (!ce_stage(ce)) { errs |= checkout_entry(ce, &state, NULL); continue; @@ -309,7 +339,8 @@ static int checkout_paths(struct tree *source_tree, const char **pathspec, return errs; } -static void show_local_changes(struct object *head, struct diff_options *opts) +static void show_local_changes(struct object *head, + const struct diff_options *opts) { struct rev_info rev; /* I think we want full paths, even if we're in a subdirectory. */ @@ -331,7 +362,8 @@ static void describe_detached_head(const char *msg, struct commit *commit) strbuf_release(&sb); } -static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree) +static int reset_tree(struct tree *tree, const struct checkout_opts *o, + int worktree, int *writeout_error) { struct unpack_trees_options opts; struct tree_desc tree_desc; @@ -350,7 +382,7 @@ static int reset_tree(struct tree *tree, struct checkout_opts *o, int worktree) init_tree_desc(&tree_desc, tree->buffer, tree->size); switch (unpack_trees(1, &tree_desc, &opts)) { case -2: - o->writeout_error = 1; + *writeout_error = 1; /* * We return 0 nevertheless, as the index is all right * and more importantly we have made best efforts to @@ -381,8 +413,10 @@ static void setup_branch_path(struct branch_info *branch) branch->path = strbuf_detach(&buf, NULL); } -static int merge_working_tree(struct checkout_opts *opts, - struct branch_info *old, struct branch_info *new) +static int merge_working_tree(const struct checkout_opts *opts, + struct branch_info *old, + struct branch_info *new, + int *writeout_error) { int ret; struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file)); @@ -393,7 +427,7 @@ static int merge_working_tree(struct checkout_opts *opts, resolve_undo_clear(); if (opts->force) { - ret = reset_tree(new->commit->tree, opts, 1); + ret = reset_tree(new->commit->tree, opts, 1, writeout_error); if (ret) return ret; } else { @@ -479,7 +513,8 @@ static int merge_working_tree(struct checkout_opts *opts, o.verbosity = 0; work = write_tree_from_memory(&o); - ret = reset_tree(new->commit->tree, opts, 1); + ret = reset_tree(new->commit->tree, opts, 1, + writeout_error); if (ret) return ret; o.ancestor = old->name; @@ -487,7 +522,8 @@ static int merge_working_tree(struct checkout_opts *opts, o.branch2 = "local"; merge_trees(&o, new->commit->tree, work, old->commit->tree, &result); - ret = reset_tree(new->commit->tree, opts, 0); + ret = reset_tree(new->commit->tree, opts, 0, + writeout_error); if (ret) return ret; } @@ -514,7 +550,7 @@ static void report_tracking(struct branch_info *new) strbuf_release(&sb); } -static void update_refs_for_switch(struct checkout_opts *opts, +static void update_refs_for_switch(const struct checkout_opts *opts, struct branch_info *old, struct branch_info *new) { @@ -701,13 +737,14 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new) free(refs.objects); } -static int switch_branches(struct checkout_opts *opts, struct branch_info *new) +static int switch_branches(const struct checkout_opts *opts, + struct branch_info *new) { int ret = 0; struct branch_info old; void *path_to_free; unsigned char rev[20]; - int flag; + int flag, writeout_error = 0; memset(&old, 0, sizeof(old)); old.path = path_to_free = resolve_refdup("HEAD", rev, 0, &flag); old.commit = lookup_commit_reference_gently(rev, 1); @@ -725,7 +762,7 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new) parse_commit(new->commit); } - ret = merge_working_tree(opts, &old, new); + ret = merge_working_tree(opts, &old, new, &writeout_error); if (ret) { free(path_to_free); return ret; @@ -738,7 +775,7 @@ static int switch_branches(struct checkout_opts *opts, struct branch_info *new) ret = post_checkout_hook(old.commit, new->commit, 1); free(path_to_free); - return ret || opts->writeout_error; + return ret || writeout_error; } static int git_checkout_config(const char *var, const char *value, void *cb) @@ -755,12 +792,6 @@ static int git_checkout_config(const char *var, const char *value, void *cb) return git_xmerge_config(var, value, NULL); } -static int interactive_checkout(const char *revision, const char **pathspec, - struct checkout_opts *opts) -{ - return run_add_interactive(revision, "--patch=checkout", pathspec); -} - struct tracking_name_data { const char *name; char *remote; @@ -910,7 +941,7 @@ static int parse_branchname_arg(int argc, const char **argv, return argcount; } -static int switch_unborn_to_new_branch(struct checkout_opts *opts) +static int switch_unborn_to_new_branch(const struct checkout_opts *opts) { int status; struct strbuf branch_ref = STRBUF_INIT; @@ -923,14 +954,56 @@ static int switch_unborn_to_new_branch(struct checkout_opts *opts) return status; } +static int checkout_branch(struct checkout_opts *opts, + struct branch_info *new) +{ + if (opts->pathspec) + die(_("paths cannot be used with switching branches")); + + if (opts->patch_mode) + die(_("'%s' cannot be used with switching branches"), + "--patch"); + + if (opts->writeout_stage) + die(_("'%s' cannot be used with switching branches"), + "--ours/--theirs"); + + if (opts->force && opts->merge) + die(_("'%s' cannot be used with '%s'"), "-f", "-m"); + + if (opts->force_detach && opts->new_branch) + die(_("'%s' cannot be used with '%s'"), + "--detach", "-b/-B/--orphan"); + + if (opts->new_orphan_branch) { + if (opts->track != BRANCH_TRACK_UNSPECIFIED) + die(_("'%s' cannot be used with '%s'"), "--orphan", "-t"); + } else if (opts->force_detach) { + if (opts->track != BRANCH_TRACK_UNSPECIFIED) + die(_("'%s' cannot be used with '%s'"), "--detach", "-t"); + } else if (opts->track == BRANCH_TRACK_UNSPECIFIED) + opts->track = git_branch_track; + + if (new->name && !new->commit) + die(_("Cannot switch branch to a non-commit '%s'"), + new->name); + + if (!new->commit && opts->new_branch) { + unsigned char rev[20]; + int flag; + + if (!read_ref_full("HEAD", rev, 0, &flag) && + (flag & REF_ISSYMREF) && is_null_sha1(rev)) + return switch_unborn_to_new_branch(opts); + } + return switch_branches(opts, new); +} + int cmd_checkout(int argc, const char **argv, const char *prefix) { struct checkout_opts opts; - unsigned char rev[20]; struct branch_info new; - struct tree *source_tree = NULL; char *conflict_style = NULL; - int patch_mode = 0; int dwim_new_local_branch = 1; struct option options[] = { OPT__QUIET(&opts.quiet, N_("suppress progress reporting")), @@ -952,7 +1025,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) OPT_BOOLEAN(0, "overwrite-ignore", &opts.overwrite_ignore, N_("update ignored files (default)")), OPT_STRING(0, "conflict", &conflict_style, N_("style"), N_("conflict style (merge or diff3)")), - OPT_BOOLEAN('p', "patch", &patch_mode, N_("select hunks interactively")), + OPT_BOOLEAN('p', "patch", &opts.patch_mode, N_("select hunks interactively")), { OPTION_BOOLEAN, 0, "guess", &dwim_new_local_branch, NULL, N_("second guess 'git checkout no-such-branch'"), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, @@ -962,6 +1035,7 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) memset(&opts, 0, sizeof(opts)); memset(&new, 0, sizeof(new)); opts.overwrite_ignore = 1; + opts.prefix = prefix; gitmodules_config(); git_config(git_checkout_config, &opts); @@ -971,26 +1045,27 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, checkout_usage, PARSE_OPT_KEEP_DASHDASH); - /* we can assume from now on new_branch = !new_branch_force */ - if (opts.new_branch && opts.new_branch_force) - die(_("-B cannot be used with -b")); + if (conflict_style) { + opts.merge = 1; /* implied */ + git_xmerge_config("merge.conflictstyle", conflict_style, NULL); + } + + if ((!!opts.new_branch + !!opts.new_branch_force + !!opts.new_orphan_branch) > 1) + die(_("-b, -B and --orphan are mutually exclusive")); - /* copy -B over to -b, so that we can just check the latter */ + /* + * From here on, new_branch will contain the branch to be checked out, + * and new_branch_force and new_orphan_branch will tell us which one of + * -b/-B/--orphan is being used. + */ if (opts.new_branch_force) opts.new_branch = opts.new_branch_force; - if (patch_mode && (opts.track > 0 || opts.new_branch - || opts.new_branch_log || opts.merge || opts.force - || opts.force_detach)) - die (_("--patch is incompatible with all other options")); - - if (opts.force_detach && (opts.new_branch || opts.new_orphan_branch)) - die(_("--detach cannot be used with -b/-B/--orphan")); - if (opts.force_detach && 0 < opts.track) - die(_("--detach cannot be used with -t")); + if (opts.new_orphan_branch) + opts.new_branch = opts.new_orphan_branch; - /* --track without -b should DWIM */ - if (0 < opts.track && !opts.new_branch) { + /* --track without -b/-B/--orphan should DWIM */ + if (opts.track != BRANCH_TRACK_UNSPECIFIED && !opts.new_branch) { const char *argv0 = argv[0]; if (!argc || !strcmp(argv0, "--")) die (_("--track needs a branch name")); @@ -1004,22 +1079,6 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) opts.new_branch = argv0 + 1; } - if (opts.new_orphan_branch) { - if (opts.new_branch) - die(_("--orphan and -b|-B are mutually exclusive")); - if (opts.track > 0) - die(_("--orphan cannot be used with -t")); - opts.new_branch = opts.new_orphan_branch; - } - - if (conflict_style) { - opts.merge = 1; /* implied */ - git_xmerge_config("merge.conflictstyle", conflict_style, NULL); - } - - if (opts.force && opts.merge) - die(_("git checkout: -f and -m are incompatible")); - /* * Extract branch name from command line arguments, so * all that is left is pathspecs. @@ -1034,73 +1093,56 @@ int cmd_checkout(int argc, const char **argv, const char *prefix) * remote branches, erroring out for invalid or ambiguous cases. */ if (argc) { + unsigned char rev[20]; int dwim_ok = - !patch_mode && + !opts.patch_mode && dwim_new_local_branch && opts.track == BRANCH_TRACK_UNSPECIFIED && !opts.new_branch; int n = parse_branchname_arg(argc, argv, dwim_ok, - &new, &source_tree, rev, &opts.new_branch); + &new, &opts.source_tree, + rev, &opts.new_branch); argv += n; argc -= n; } - if (opts.track == BRANCH_TRACK_UNSPECIFIED) - opts.track = git_branch_track; - if (argc) { - const char **pathspec = get_pathspec(prefix, argv); + opts.pathspec = get_pathspec(prefix, argv); - if (!pathspec) + if (!opts.pathspec) die(_("invalid path specification")); - if (patch_mode) - return interactive_checkout(new.name, pathspec, &opts); - - /* Checkout paths */ - if (opts.new_branch) { - if (argc == 1) { - die(_("git checkout: updating paths is incompatible with switching branches.\nDid you intend to checkout '%s' which can not be resolved as commit?"), argv[0]); - } else { - die(_("git checkout: updating paths is incompatible with switching branches.")); - } - } + /* + * Try to give more helpful suggestion. + * new_branch && argc > 1 will be caught later. + */ + if (opts.new_branch && argc == 1) + die(_("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?"), + opts.new_branch, argv[0]); if (opts.force_detach) - die(_("git checkout: --detach does not take a path argument")); + die(_("git checkout: --detach does not take a path argument '%s'"), + argv[0]); if (1 < !!opts.writeout_stage + !!opts.force + !!opts.merge) - die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\nchecking out of the index.")); - - return checkout_paths(source_tree, pathspec, prefix, &opts); + die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n" + "checking out of the index.")); } - if (patch_mode) - return interactive_checkout(new.name, NULL, &opts); - if (opts.new_branch) { struct strbuf buf = STRBUF_INIT; - opts.branch_exists = validate_new_branchname(opts.new_branch, &buf, - !!opts.new_branch_force, - !!opts.new_branch_force); + opts.branch_exists = + validate_new_branchname(opts.new_branch, &buf, + !!opts.new_branch_force, + !!opts.new_branch_force); strbuf_release(&buf); } - if (new.name && !new.commit) { - die(_("Cannot switch branch to a non-commit.")); - } - if (opts.writeout_stage) - die(_("--ours/--theirs is incompatible with switching branches.")); - - if (!new.commit && opts.new_branch) { - unsigned char rev[20]; - int flag; - - if (!read_ref_full("HEAD", rev, 0, &flag) && - (flag & REF_ISSYMREF) && is_null_sha1(rev)) - return switch_unborn_to_new_branch(&opts); - } - return switch_branches(&opts, &new); + if (opts.patch_mode || opts.pathspec) + return checkout_paths(&opts, new.name); + else + return checkout_branch(&opts, &new); } diff --git a/builtin/clone.c b/builtin/clone.c index 5e8f3ba22c..5a9b2bce24 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -236,7 +236,7 @@ static int add_one_reference(struct string_list_item *item, void *cb_data) /* Beware: real_path() and mkpath() return static buffer */ ref_git = xstrdup(real_path(item->string)); if (is_directory(mkpath("%s/.git/objects", ref_git))) { - char *ref_git_git = xstrdup(mkpath("%s/.git", ref_git)); + char *ref_git_git = mkpathdup("%s/.git", ref_git); free(ref_git); ref_git = ref_git_git; } else if (!is_directory(mkpath("%s/objects", ref_git))) @@ -700,7 +700,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) git_dir = xstrdup(dir); else { work_tree = dir; - git_dir = xstrdup(mkpath("%s/.git", dir)); + git_dir = mkpathdup("%s/.git", dir); } if (!option_bare) { diff --git a/builtin/commit.c b/builtin/commit.c index feb43f49dc..4d50484837 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -28,6 +28,7 @@ #include "submodule.h" #include "gpg-interface.h" #include "column.h" +#include "sequencer.h" static const char * const builtin_commit_usage[] = { N_("git commit [options] [--] <filepattern>..."), @@ -466,8 +467,6 @@ static int is_a_merge(const struct commit *current_head) return !!(current_head->parents && current_head->parents->next); } -static const char sign_off_header[] = "Signed-off-by: "; - static void export_one(const char *var, const char *s, const char *e, int hack) { struct strbuf buf = STRBUF_INIT; @@ -478,6 +477,20 @@ static void export_one(const char *var, const char *s, const char *e, int hack) strbuf_release(&buf); } +static int sane_ident_split(struct ident_split *person) +{ + if (!person->name_begin || !person->name_end || + person->name_begin == person->name_end) + return 0; /* no human readable name */ + if (!person->mail_begin || !person->mail_end || + person->mail_begin == person->mail_end) + return 0; /* no usable mail */ + if (!person->date_begin || !person->date_end || + !person->tz_begin || !person->tz_end) + return 0; + return 1; +} + static void determine_author_info(struct strbuf *author_ident) { char *name, *email, *date; @@ -530,54 +543,14 @@ static void determine_author_info(struct strbuf *author_ident) if (force_date) date = force_date; strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT)); - if (!split_ident_line(&author, author_ident->buf, author_ident->len)) { + if (!split_ident_line(&author, author_ident->buf, author_ident->len) && + sane_ident_split(&author)) { export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0); export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0); export_one("GIT_AUTHOR_DATE", author.date_begin, author.tz_end, '@'); } } -static int ends_rfc2822_footer(struct strbuf *sb) -{ - int ch; - int hit = 0; - int i, j, k; - int len = sb->len; - int first = 1; - const char *buf = sb->buf; - - for (i = len - 1; i > 0; i--) { - if (hit && buf[i] == '\n') - break; - hit = (buf[i] == '\n'); - } - - while (i < len - 1 && buf[i] == '\n') - i++; - - for (; i < len; i = k) { - for (k = i; k < len && buf[k] != '\n'; k++) - ; /* do nothing */ - k++; - - if ((buf[k] == ' ' || buf[k] == '\t') && !first) - continue; - - first = 0; - - for (j = 0; i + j < len; j++) { - ch = buf[i + j]; - if (ch == ':') - break; - if (isalnum(ch) || - (ch == '-')) - continue; - return 0; - } - } - return 1; -} - static char *cut_ident_timestamp_part(char *string) { char *ket = strrchr(string, '>'); @@ -702,21 +675,30 @@ static int prepare_to_commit(const char *index_file, const char *prefix, stripspace(&sb, 0); if (signoff) { - struct strbuf sob = STRBUF_INIT; - int i; - - strbuf_addstr(&sob, sign_off_header); - strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), - getenv("GIT_COMMITTER_EMAIL"))); - strbuf_addch(&sob, '\n'); - for (i = sb.len - 1; i > 0 && sb.buf[i - 1] != '\n'; i--) - ; /* do nothing */ - if (prefixcmp(sb.buf + i, sob.buf)) { - if (!i || !ends_rfc2822_footer(&sb)) - strbuf_addch(&sb, '\n'); - strbuf_addbuf(&sb, &sob); + /* + * See if we have a Conflicts: block at the end. If yes, count + * its size, so we can ignore it. + */ + int ignore_footer = 0; + int i, eol, previous = 0; + const char *nl; + + for (i = 0; i < sb.len; i++) { + nl = memchr(sb.buf + i, '\n', sb.len - i); + if (nl) + eol = nl - sb.buf; + else + eol = sb.len; + if (!prefixcmp(sb.buf + previous, "\nConflicts:\n")) { + ignore_footer = sb.len - previous; + break; + } + while (i < eol) + i++; + previous = eol; } - strbuf_release(&sob); + + append_signoff(&sb, ignore_footer); } if (fwrite(sb.buf, 1, sb.len, s->fp) < sb.len) diff --git a/builtin/fetch.c b/builtin/fetch.c index 3f2ad7727f..4b5a89839b 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -14,6 +14,7 @@ #include "transport.h" #include "submodule.h" #include "connected.h" +#include "argv-array.h" static const char * const builtin_fetch_usage[] = { N_("git fetch [<options>] [<repository> [<refspec>...]]"), @@ -255,9 +256,8 @@ static int update_local_ref(struct ref *ref, if (!hashcmp(ref->old_sha1, ref->new_sha1)) { if (verbosity > 0) strbuf_addf(display, "= %-*s %-*s -> %s", - TRANSPORT_SUMMARY_WIDTH, - _("[up to date]"), REFCOL_WIDTH, - remote, pretty_ref); + TRANSPORT_SUMMARY(_("[up to date]")), + REFCOL_WIDTH, remote, pretty_ref); return 0; } @@ -271,7 +271,7 @@ static int update_local_ref(struct ref *ref, */ strbuf_addf(display, _("! %-*s %-*s -> %s (can't fetch in current branch)"), - TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), + TRANSPORT_SUMMARY(_("[rejected]")), REFCOL_WIDTH, remote, pretty_ref); return 1; } @@ -282,7 +282,7 @@ static int update_local_ref(struct ref *ref, r = s_update_ref("updating tag", ref, 0); strbuf_addf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '-', - TRANSPORT_SUMMARY_WIDTH, _("[tag update]"), + TRANSPORT_SUMMARY(_("[tag update]")), REFCOL_WIDTH, remote, pretty_ref, r ? _(" (unable to update local ref)") : ""); return r; @@ -317,13 +317,13 @@ static int update_local_ref(struct ref *ref, r = s_update_ref(msg, ref, 0); strbuf_addf(display, "%c %-*s %-*s -> %s%s", r ? '!' : '*', - TRANSPORT_SUMMARY_WIDTH, what, + TRANSPORT_SUMMARY(what), REFCOL_WIDTH, remote, pretty_ref, r ? _(" (unable to update local ref)") : ""); return r; } - if (in_merge_bases(current, &updated, 1)) { + if (in_merge_bases(current, updated)) { char quickref[83]; int r; strcpy(quickref, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); @@ -357,7 +357,7 @@ static int update_local_ref(struct ref *ref, return r; } else { strbuf_addf(display, "! %-*s %-*s -> %s %s", - TRANSPORT_SUMMARY_WIDTH, _("[rejected]"), + TRANSPORT_SUMMARY(_("[rejected]")), REFCOL_WIDTH, remote, pretty_ref, _("(non-fast-forward)")); return 1; @@ -554,7 +554,7 @@ static int prune_refs(struct refspec *refs, int ref_count, struct ref *ref_map) result |= delete_ref(ref->name, NULL, 0); if (verbosity >= 0) { fprintf(stderr, " x %-*s %-*s -> %s\n", - TRANSPORT_SUMMARY_WIDTH, _("[deleted]"), + TRANSPORT_SUMMARY(_("[deleted]")), REFCOL_WIDTH, _("(none)"), prettify_refname(ref->name)); warn_dangling_symref(stderr, dangling_msg, ref->name); } @@ -841,38 +841,39 @@ static int add_remote_or_group(const char *name, struct string_list *list) return 1; } -static void add_options_to_argv(int *argc, const char **argv) +static void add_options_to_argv(struct argv_array *argv) { if (dry_run) - argv[(*argc)++] = "--dry-run"; + argv_array_push(argv, "--dry-run"); if (prune) - argv[(*argc)++] = "--prune"; + argv_array_push(argv, "--prune"); if (update_head_ok) - argv[(*argc)++] = "--update-head-ok"; + argv_array_push(argv, "--update-head-ok"); if (force) - argv[(*argc)++] = "--force"; + argv_array_push(argv, "--force"); if (keep) - argv[(*argc)++] = "--keep"; + argv_array_push(argv, "--keep"); if (recurse_submodules == RECURSE_SUBMODULES_ON) - argv[(*argc)++] = "--recurse-submodules"; + argv_array_push(argv, "--recurse-submodules"); else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) - argv[(*argc)++] = "--recurse-submodules=on-demand"; + argv_array_push(argv, "--recurse-submodules=on-demand"); + if (tags == TAGS_SET) + argv_array_push(argv, "--tags"); + else if (tags == TAGS_UNSET) + argv_array_push(argv, "--no-tags"); if (verbosity >= 2) - argv[(*argc)++] = "-v"; + argv_array_push(argv, "-v"); if (verbosity >= 1) - argv[(*argc)++] = "-v"; + argv_array_push(argv, "-v"); else if (verbosity < 0) - argv[(*argc)++] = "-q"; + argv_array_push(argv, "-q"); } static int fetch_multiple(struct string_list *list) { int i, result = 0; - const char *argv[12] = { "fetch", "--append" }; - int argc = 2; - - add_options_to_argv(&argc, argv); + struct argv_array argv = ARGV_ARRAY_INIT; if (!append && !dry_run) { int errcode = truncate_fetch_head(); @@ -880,18 +881,22 @@ static int fetch_multiple(struct string_list *list) return errcode; } + argv_array_pushl(&argv, "fetch", "--append", NULL); + add_options_to_argv(&argv); + for (i = 0; i < list->nr; i++) { const char *name = list->items[i].string; - argv[argc] = name; - argv[argc + 1] = NULL; + argv_array_push(&argv, name); if (verbosity >= 0) printf(_("Fetching %s\n"), name); - if (run_command_v_opt(argv, RUN_GIT_CMD)) { + if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) { error(_("Could not fetch %s"), name); result = 1; } + argv_array_pop(&argv); } + argv_array_clear(&argv); return result; } @@ -1007,13 +1012,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) } if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) { - const char *options[10]; - int num_options = 0; - add_options_to_argv(&num_options, options); - result = fetch_populated_submodules(num_options, options, + struct argv_array options = ARGV_ARRAY_INIT; + + add_options_to_argv(&options); + result = fetch_populated_submodules(&options, submodule_prefix, recurse_submodules, verbosity < 0); + argv_array_clear(&options); } /* All names were strdup()ed or strndup()ed */ diff --git a/builtin/grep.c b/builtin/grep.c index 09ca4c980e..82530a61b4 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -209,6 +209,7 @@ static void start_threads(struct grep_opt *opt) int err; struct grep_opt *o = grep_opt_dup(opt); o->output = strbuf_out; + o->debug = 0; compile_grep_patterns(o); err = pthread_create(&threads[i], NULL, run, o); @@ -817,6 +818,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix) N_("indicate hit with exit status without output")), OPT_BOOLEAN(0, "all-match", &opt.all_match, N_("show only matches from files that match all patterns")), + { OPTION_SET_INT, 0, "debug", &opt.debug, NULL, + N_("show parse tree for grep expression"), + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1 }, OPT_GROUP(""), { OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager, N_("pager"), N_("show matching files in the pager"), diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 953dd3004e..43d364b8d5 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -291,7 +291,7 @@ static void parse_pack_header(void) if (hdr->hdr_signature != htonl(PACK_SIGNATURE)) die(_("pack signature mismatch")); if (!pack_version_ok(hdr->hdr_version)) - die("pack version %"PRIu32" unsupported", + die(_("pack version %"PRIu32" unsupported"), ntohl(hdr->hdr_version)); nr_objects = ntohl(hdr->hdr_entries); @@ -1061,7 +1061,8 @@ static void resolve_deltas(void) int ret = pthread_create(&thread_data[i].thread, NULL, threaded_second_pass, thread_data + i); if (ret) - die("unable to create thread: %s", strerror(ret)); + die(_("unable to create thread: %s"), + strerror(ret)); } for (i = 0; i < nr_threads; i++) pthread_join(thread_data[i].thread, NULL); @@ -1108,7 +1109,7 @@ 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", + sprintf(msg, _("completed with %d local objects"), nr_objects - nr_objects_initial); stop_progress_msg(&progress, msg); sha1close(f, tail_sha1, 0); @@ -1117,8 +1118,8 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha curr_pack, nr_objects, read_sha1, consumed_bytes-20); if (hashcmp(read_sha1, tail_sha1) != 0) - die("Unexpected tail checksum for %s " - "(disk corruption?)", curr_pack); + die(_("Unexpected tail checksum for %s " + "(disk corruption?)"), curr_pack); } if (nr_deltas != nr_resolved_deltas) die(Q_("pack has %d unresolved delta", @@ -1327,17 +1328,17 @@ static int git_index_pack_config(const char *k, const char *v, void *cb) if (!strcmp(k, "pack.indexversion")) { opts->version = git_config_int(k, v); if (opts->version > 2) - die("bad pack.indexversion=%"PRIu32, opts->version); + die(_("bad pack.indexversion=%"PRIu32), opts->version); return 0; } if (!strcmp(k, "pack.threads")) { nr_threads = git_config_int(k, v); if (nr_threads < 0) - die("invalid number of threads specified (%d)", + die(_("invalid number of threads specified (%d)"), nr_threads); #ifdef NO_PTHREADS if (nr_threads != 1) - warning("no threads support, ignoring %s", k); + warning(_("no threads support, ignoring %s"), k); nr_threads = 1; #endif return 0; @@ -1510,8 +1511,8 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix) usage(index_pack_usage); #ifdef NO_PTHREADS if (nr_threads != 1) - warning("no threads support, " - "ignoring %s", arg); + warning(_("no threads support, " + "ignoring %s"), arg); nr_threads = 1; #endif } else if (!prefixcmp(arg, "--pack_header=")) { diff --git a/builtin/log.c b/builtin/log.c index d76f359440..09cf43e6d4 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -109,9 +109,9 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH); - argc = setup_revisions(argc, argv, rev, opt); if (quiet) rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT; + argc = setup_revisions(argc, argv, rev, opt); /* Any arguments at this point are not recognized */ if (argc > 1) @@ -456,7 +456,7 @@ int cmd_show(int argc, const char **argv, const char *prefix) init_revisions(&rev, prefix); rev.diff = 1; rev.always_show_header = 1; - rev.no_walk = 1; + rev.no_walk = REVISION_WALK_NO_WALK_SORTED; rev.diffopt.stat_width = -1; /* Scale to real terminal size */ memset(&opt, 0, sizeof(opt)); diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c index 41c88a98a2..25e83cfe9d 100644 --- a/builtin/ls-remote.c +++ b/builtin/ls-remote.c @@ -5,7 +5,7 @@ static const char ls_remote_usage[] = "git ls-remote [--heads] [--tags] [-u <exec> | --upload-pack <exec>]\n" -" [-q|--quiet] [--exit-code] [<repository> [<refs>...]]"; +" [-q|--quiet] [--exit-code] [--get-url] [<repository> [<refs>...]]"; /* * Is there one among the list of patterns that match the tail part diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index dd4f925475..b691b77158 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -232,7 +232,9 @@ static void cleanup_subject(struct strbuf *subject) case 'r': case 'R': if (subject->len <= at + 3) break; - if (!memcmp(subject->buf + at + 1, "e:", 2)) { + if ((subject->buf[at + 1] == 'e' || + subject->buf[at + 1] == 'E') && + subject->buf[at + 2] == ':') { strbuf_remove(subject, at, 3); continue; } diff --git a/builtin/merge-base.c b/builtin/merge-base.c index 2f223a6646..1bc7991048 100644 --- a/builtin/merge-base.c +++ b/builtin/merge-base.c @@ -26,6 +26,7 @@ static const char * const merge_base_usage[] = { N_("git merge-base [-a|--all] <commit> <commit>..."), N_("git merge-base [-a|--all] --octopus <commit>..."), N_("git merge-base --independent <commit>..."), + N_("git merge-base --is-ancestor <commit> <commit>"), NULL }; @@ -70,6 +71,20 @@ static int handle_octopus(int count, const char **args, int reduce, int show_all return 0; } +static int handle_is_ancestor(int argc, const char **argv) +{ + struct commit *one, *two; + + if (argc != 2) + die("--is-ancestor takes exactly two commits"); + one = get_commit_reference(argv[0]); + two = get_commit_reference(argv[1]); + if (in_merge_bases(one, two)) + return 0; + else + return 1; +} + int cmd_merge_base(int argc, const char **argv, const char *prefix) { struct commit **rev; @@ -77,11 +92,14 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) int show_all = 0; int octopus = 0; int reduce = 0; + int is_ancestor = 0; struct option options[] = { OPT_BOOLEAN('a', "all", &show_all, N_("output all common ancestors")), OPT_BOOLEAN(0, "octopus", &octopus, N_("find ancestors for a single n-way merge")), OPT_BOOLEAN(0, "independent", &reduce, N_("list revs not reachable from others")), + OPT_BOOLEAN(0, "is-ancestor", &is_ancestor, + N_("is the first one ancestor of the other?")), OPT_END() }; @@ -89,6 +107,10 @@ int cmd_merge_base(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, merge_base_usage, 0); if (!octopus && !reduce && argc < 2) usage_with_options(merge_base_usage, options); + if (is_ancestor && (show_all | octopus | reduce)) + die("--is-ancestor cannot be used with other options"); + if (is_ancestor) + return handle_is_ancestor(argc, argv); if (reduce && (show_all || octopus)) die("--independent cannot be used with other options"); diff --git a/builtin/notes.c b/builtin/notes.c index 554c80167c..453457adb9 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -19,6 +19,9 @@ #include "string-list.h" #include "notes-merge.h" +static void commit_notes(struct notes_tree *t, const char *msg); +static combine_notes_fn parse_combine_notes_fn(const char *v); + static const char * const git_notes_usage[] = { N_("git notes [--ref <notes_ref>] [list [<object>]]"), N_("git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) <object>] [<object>]"), @@ -288,7 +291,7 @@ static int parse_reedit_arg(const struct option *opt, const char *arg, int unset return parse_reuse_arg(opt, arg, unset); } -void commit_notes(struct notes_tree *t, const char *msg) +static void commit_notes(struct notes_tree *t, const char *msg) { struct strbuf buf = STRBUF_INIT; unsigned char commit_sha1[20]; @@ -312,7 +315,7 @@ void commit_notes(struct notes_tree *t, const char *msg) strbuf_release(&buf); } -combine_notes_fn parse_combine_notes_fn(const char *v) +static combine_notes_fn parse_combine_notes_fn(const char *v) { if (!strcasecmp(v, "overwrite")) return combine_notes_overwrite; diff --git a/builtin/prune.c b/builtin/prune.c index 9a03d24dad..8cb8b9186a 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -169,7 +169,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) prune_packed_objects(show_only); remove_temporary_files(get_object_directory()); - s = xstrdup(mkpath("%s/pack", get_object_directory())); + s = mkpathdup("%s/pack", get_object_directory()); remove_temporary_files(s); free(s); return 0; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 2cb854feb4..9145f1a595 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -480,7 +480,6 @@ static const char *update(struct command *cmd) !prefixcmp(name, "refs/heads/")) { struct object *old_object, *new_object; struct commit *old_commit, *new_commit; - struct commit_list *bases, *ent; old_object = parse_object(old_sha1); new_object = parse_object(new_sha1); @@ -493,12 +492,7 @@ static const char *update(struct command *cmd) } old_commit = (struct commit *)old_object; new_commit = (struct commit *)new_object; - bases = get_merge_bases(old_commit, new_commit, 1); - for (ent = bases; ent; ent = ent->next) - if (!hashcmp(old_sha1, ent->item->object.sha1)) - break; - free_commit_list(bases); - if (!ent) { + if (!in_merge_bases(old_commit, new_commit)) { rp_error("denying non-fast-forward %s" " (you should pull first)", name); return "non-fast-forward"; diff --git a/builtin/remote.c b/builtin/remote.c index 8a670d82a7..a5a4b23231 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -11,7 +11,7 @@ static const char * const builtin_remote_usage[] = { N_("git remote [-v | --verbose]"), N_("git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--mirror=<fetch|push>] <name> <url>"), N_("git remote rename <old> <new>"), - N_("git remote rm <name>"), + N_("git remote remove <name>"), N_("git remote set-head <name> (-a | -d | <branch>)"), N_("git remote [-v | --verbose] show [-n] <name>"), N_("git remote prune [-n | --dry-run] <name>"), @@ -34,7 +34,7 @@ static const char * const builtin_remote_rename_usage[] = { }; static const char * const builtin_remote_rm_usage[] = { - N_("git remote rm <name>"), + N_("git remote remove <name>"), NULL }; @@ -1580,7 +1580,7 @@ int cmd_remote(int argc, const char **argv, const char *prefix) result = add(argc, argv); else if (!strcmp(argv[0], "rename")) result = mv(argc, argv); - else if (!strcmp(argv[0], "rm")) + else if (!strcmp(argv[0], "rm") || !strcmp(argv[0], "remove")) result = rm(argc, argv); else if (!strcmp(argv[0], "set-head")) result = set_head(argc, argv); diff --git a/builtin/revert.c b/builtin/revert.c index 17dc8c8d1e..c5e36b94c0 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -195,7 +195,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) struct setup_revision_opt s_r_opt; opts->revs = xmalloc(sizeof(*opts->revs)); init_revisions(opts->revs, NULL); - opts->revs->no_walk = 1; + opts->revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; if (argc < 2) usage_with_options(usage_str, options); memset(&s_r_opt, 0, sizeof(s_r_opt)); @@ -442,7 +442,6 @@ extern int discard_index(struct index_state *); extern int unmerged_index(const struct index_state *); extern int verify_path(const char *path); extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase); -extern int index_name_stage_pos(const struct index_state *, const char *name, int namelen, int stage); extern int index_name_pos(const struct index_state *, const char *name, int namelen); #define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */ #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ @@ -902,9 +901,7 @@ extern const char *git_author_info(int); extern const char *git_committer_info(int); extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int); extern const char *fmt_name(const char *name, const char *email); -extern const char *ident_default_name(void); extern const char *ident_default_email(void); -extern const char *ident_default_date(void); extern const char *git_editor(void); extern const char *git_pager(int stdout_is_tty); extern int git_ident_config(const char *, const char *, void *); @@ -947,9 +944,7 @@ struct cache_def { extern int has_symlink_leading_path(const char *name, int len); extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); extern int check_leading_path(const char *name, int len); -extern int threaded_check_leading_path(struct cache_def *cache, const char *name, int len); extern int has_dirs_only_path(const char *name, int len, int prefix_len); -extern int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len); extern void schedule_dir_for_removal(const char *name, int len); extern void remove_scheduled_dirs(void); @@ -1208,7 +1203,6 @@ extern void alloc_report(void); /* trace.c */ __attribute__((format (printf, 1, 2))) extern void trace_printf(const char *format, ...); -extern void trace_vprintf(const char *key, const char *format, va_list ap); __attribute__((format (printf, 2, 3))) extern void trace_argv_printf(const char **argv, const char *format, ...); extern void trace_repo_setup(const char *prefix); @@ -9,6 +9,8 @@ #include "gpg-interface.h" #include "mergesort.h" +static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); + int save_commit_buffer = 1; const char *commit_type = "commit"; @@ -607,28 +609,12 @@ static struct commit *interesting(struct commit_list *list) return NULL; } -static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) +static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos) { struct commit_list *list = NULL; struct commit_list *result = NULL; int i; - for (i = 0; i < n; i++) { - if (one == twos[i]) - /* - * We do not mark this even with RESULT so we do not - * have to clean it up. - */ - return commit_list_insert(one, &result); - } - - if (parse_commit(one)) - return NULL; - for (i = 0; i < n; i++) { - if (parse_commit(twos[i])) - return NULL; - } - one->object.flags |= PARENT1; commit_list_insert_by_date(one, &list); for (i = 0; i < n; i++) { @@ -669,9 +655,34 @@ static struct commit_list *merge_bases_many(struct commit *one, int n, struct co } } - /* Clean up the result to remove stale ones */ free_commit_list(list); - list = result; result = NULL; + return result; +} + +static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos) +{ + struct commit_list *list = NULL; + struct commit_list *result = NULL; + int i; + + for (i = 0; i < n; i++) { + if (one == twos[i]) + /* + * We do not mark this even with RESULT so we do not + * have to clean it up. + */ + return commit_list_insert(one, &result); + } + + if (parse_commit(one)) + return NULL; + for (i = 0; i < n; i++) { + if (parse_commit(twos[i])) + return NULL; + } + + list = paint_down_to_common(one, n, twos); + while (list) { struct commit_list *next = list->next; if (!(list->item->object.flags & STALE)) @@ -709,6 +720,60 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in) return ret; } +static int remove_redundant(struct commit **array, int cnt) +{ + /* + * Some commit in the array may be an ancestor of + * another commit. Move such commit to the end of + * the array, and return the number of commits that + * are independent from each other. + */ + struct commit **work; + unsigned char *redundant; + int *filled_index; + int i, j, filled; + + work = xcalloc(cnt, sizeof(*work)); + redundant = xcalloc(cnt, 1); + filled_index = xmalloc(sizeof(*filled_index) * (cnt - 1)); + + for (i = 0; i < cnt; i++) { + struct commit_list *common; + + if (redundant[i]) + continue; + for (j = filled = 0; j < cnt; j++) { + if (i == j || redundant[j]) + continue; + filled_index[filled] = j; + work[filled++] = array[j]; + } + common = paint_down_to_common(array[i], filled, work); + if (array[i]->object.flags & PARENT2) + redundant[i] = 1; + for (j = 0; j < filled; j++) + if (work[j]->object.flags & PARENT1) + redundant[filled_index[j]] = 1; + clear_commit_marks(array[i], all_flags); + for (j = 0; j < filled; j++) + clear_commit_marks(work[j], all_flags); + free_commit_list(common); + } + + /* Now collect the result */ + memcpy(work, array, sizeof(*array) * cnt); + for (i = filled = 0; i < cnt; i++) + if (!redundant[i]) + array[filled++] = work[i]; + for (j = filled, i = 0; i < cnt; i++) + if (redundant[i]) + array[j++] = work[i]; + free(work); + free(redundant); + free(filled_index); + return filled; +} + struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, @@ -717,7 +782,7 @@ struct commit_list *get_merge_bases_many(struct commit *one, struct commit_list *list; struct commit **rslt; struct commit_list *result; - int cnt, i, j; + int cnt, i; result = merge_bases_many(one, n, twos); for (i = 0; i < n; i++) { @@ -748,28 +813,11 @@ struct commit_list *get_merge_bases_many(struct commit *one, clear_commit_marks(one, all_flags); for (i = 0; i < n; i++) clear_commit_marks(twos[i], all_flags); - for (i = 0; i < cnt - 1; i++) { - for (j = i+1; j < cnt; j++) { - if (!rslt[i] || !rslt[j]) - continue; - result = merge_bases_many(rslt[i], 1, &rslt[j]); - clear_commit_marks(rslt[i], all_flags); - clear_commit_marks(rslt[j], all_flags); - for (list = result; list; list = list->next) { - if (rslt[i] == list->item) - rslt[i] = NULL; - if (rslt[j] == list->item) - rslt[j] = NULL; - } - } - } - /* Surviving ones in rslt[] are the independent results */ + cnt = remove_redundant(rslt, cnt); result = NULL; - for (i = 0; i < cnt; i++) { - if (rslt[i]) - commit_list_insert_by_date(rslt[i], &result); - } + for (i = 0; i < cnt; i++) + commit_list_insert_by_date(rslt[i], &result); free(rslt); return result; } @@ -780,6 +828,9 @@ struct commit_list *get_merge_bases(struct commit *one, struct commit *two, return get_merge_bases_many(one, 1, &two, cleanup); } +/* + * Is "commit" a decendant of one of the elements on the "with_commit" list? + */ int is_descendant_of(struct commit *commit, struct commit_list *with_commit) { if (!with_commit) @@ -789,28 +840,28 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit) other = with_commit->item; with_commit = with_commit->next; - if (in_merge_bases(other, &commit, 1)) + if (in_merge_bases(other, commit)) return 1; } return 0; } -int in_merge_bases(struct commit *commit, struct commit **reference, int num) +/* + * Is "commit" an ancestor of (i.e. reachable from) the "reference"? + */ +int in_merge_bases(struct commit *commit, struct commit *reference) { - struct commit_list *bases, *b; + struct commit_list *bases; int ret = 0; - if (num == 1) - bases = get_merge_bases(commit, *reference, 1); - else - die("not yet"); - for (b = bases; b; b = b->next) { - if (!hashcmp(commit->object.sha1, b->item->object.sha1)) { - ret = 1; - break; - } - } + if (parse_commit(commit) || parse_commit(reference)) + return ret; + bases = paint_down_to_common(commit, 1, &reference); + if (commit->object.flags & PARENT2) + ret = 1; + clear_commit_marks(commit, all_flags); + clear_commit_marks(reference, all_flags); free_commit_list(bases); return ret; } @@ -819,51 +870,31 @@ struct commit_list *reduce_heads(struct commit_list *heads) { struct commit_list *p; struct commit_list *result = NULL, **tail = &result; - struct commit **other; - size_t num_head, num_other; + struct commit **array; + int num_head, i; if (!heads) return NULL; - /* Avoid unnecessary reallocations */ - for (p = heads, num_head = 0; p; p = p->next) - num_head++; - other = xcalloc(sizeof(*other), num_head); - - /* For each commit, see if it can be reached by others */ - for (p = heads; p; p = p->next) { - struct commit_list *q, *base; - - /* Do we already have this in the result? */ - for (q = result; q; q = q->next) - if (p->item == q->item) - break; - if (q) + /* Uniquify */ + for (p = heads; p; p = p->next) + p->item->object.flags &= ~STALE; + for (p = heads, num_head = 0; p; p = p->next) { + if (p->item->object.flags & STALE) continue; - - num_other = 0; - for (q = heads; q; q = q->next) { - if (p->item == q->item) - continue; - other[num_other++] = q->item; + p->item->object.flags |= STALE; + num_head++; + } + array = xcalloc(sizeof(*array), num_head); + for (p = heads, i = 0; p; p = p->next) { + if (p->item->object.flags & STALE) { + array[i++] = p->item; + p->item->object.flags &= ~STALE; } - if (num_other) - base = get_merge_bases_many(p->item, num_other, other, 1); - else - base = NULL; - /* - * If p->item does not have anything common with other - * commits, there won't be any merge base. If it is - * reachable from some of the others, p->item will be - * the merge base. If its history is connected with - * others, but p->item is not reachable by others, we - * will get something other than p->item back. - */ - if (!base || (base->item != p->item)) - tail = &(commit_list_insert(p->item, tail)->next); - free_commit_list(base); } - free(other); + num_head = remove_redundant(array, num_head); + for (i = 0; i < num_head; i++) + tail = &commit_list_insert(array[i], tail)->next; return result; } @@ -1044,8 +1075,9 @@ static int excluded_header_field(const char *field, size_t len, const char **exc return 0; } -struct commit_extra_header *read_commit_extra_header_lines(const char *buffer, size_t size, - const char **exclude) +static struct commit_extra_header *read_commit_extra_header_lines( + const char *buffer, size_t size, + const char **exclude) { struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL; const char *line, *next, *eof, *eob; @@ -171,7 +171,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int depth, int shallow_flag, int not_shallow_flag); int is_descendant_of(struct commit *, struct commit_list *); -int in_merge_bases(struct commit *, struct commit **, int); +int in_merge_bases(struct commit *, 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, @@ -204,7 +204,6 @@ extern int commit_tree_extended(const struct strbuf *msg, unsigned char *tree, struct commit_extra_header *); extern struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **); -extern struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **); extern void free_commit_extra_headers(struct commit_extra_header *extra); diff --git a/config.mak.in b/config.mak.in index 802d34223a..69d48382fe 100644 --- a/config.mak.in +++ b/config.mak.in @@ -5,12 +5,10 @@ CC = @CC@ CFLAGS = @CFLAGS@ CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ -CC_LD_DYNPATH = @CC_LD_DYNPATH@ AR = @AR@ TAR = @TAR@ DIFF = @DIFF@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources -TCLTK_PATH = @TCLTK_PATH@ prefix = @prefix@ exec_prefix = @exec_prefix@ @@ -27,50 +25,3 @@ VPATH = @srcdir@ export exec_prefix mandir export srcdir VPATH - -NEEDS_SSL_WITH_CRYPTO=@NEEDS_SSL_WITH_CRYPTO@ -NO_OPENSSL=@NO_OPENSSL@ -NO_CURL=@NO_CURL@ -NO_EXPAT=@NO_EXPAT@ -NO_LIBGEN_H=@NO_LIBGEN_H@ -HAVE_PATHS_H=@HAVE_PATHS_H@ -HAVE_LIBCHARSET_H=@HAVE_LIBCHARSET_H@ -NO_GETTEXT=@NO_GETTEXT@ -LIBC_CONTAINS_LIBINTL=@LIBC_CONTAINS_LIBINTL@ -NEEDS_LIBICONV=@NEEDS_LIBICONV@ -NEEDS_SOCKET=@NEEDS_SOCKET@ -NEEDS_RESOLV=@NEEDS_RESOLV@ -NEEDS_LIBGEN=@NEEDS_LIBGEN@ -NO_SYS_SELECT_H=@NO_SYS_SELECT_H@ -NO_D_INO_IN_DIRENT=@NO_D_INO_IN_DIRENT@ -NO_D_TYPE_IN_DIRENT=@NO_D_TYPE_IN_DIRENT@ -NO_SOCKADDR_STORAGE=@NO_SOCKADDR_STORAGE@ -NO_IPV6=@NO_IPV6@ -NO_HSTRERROR=@NO_HSTRERROR@ -NO_STRCASESTR=@NO_STRCASESTR@ -NO_STRTOK_R=@NO_STRTOK_R@ -NO_FNMATCH=@NO_FNMATCH@ -NO_FNMATCH_CASEFOLD=@NO_FNMATCH_CASEFOLD@ -NO_MEMMEM=@NO_MEMMEM@ -NO_STRLCPY=@NO_STRLCPY@ -NO_UINTMAX_T=@NO_UINTMAX_T@ -NO_STRTOUMAX=@NO_STRTOUMAX@ -NO_SETENV=@NO_SETENV@ -NO_UNSETENV=@NO_UNSETENV@ -NO_MKDTEMP=@NO_MKDTEMP@ -NO_MKSTEMPS=@NO_MKSTEMPS@ -NO_INET_NTOP=@NO_INET_NTOP@ -NO_INET_PTON=@NO_INET_PTON@ -NO_ICONV=@NO_ICONV@ -OLD_ICONV=@OLD_ICONV@ -NO_REGEX=@NO_REGEX@ -USE_LIBPCRE=@USE_LIBPCRE@ -NO_DEFLATE_BOUND=@NO_DEFLATE_BOUND@ -INLINE=@INLINE@ -SOCKLEN_T=@SOCKLEN_T@ -FREAD_READS_DIRECTORIES=@FREAD_READS_DIRECTORIES@ -SNPRINTF_RETURNS_BOGUS=@SNPRINTF_RETURNS_BOGUS@ -NO_PTHREADS=@NO_PTHREADS@ -PTHREAD_CFLAGS=@PTHREAD_CFLAGS@ -PTHREAD_LIBS=@PTHREAD_LIBS@ -CHARSET_LIB=@CHARSET_LIB@ diff --git a/configure.ac b/configure.ac index df7e376590..da1f41f588 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,9 @@ # ------------------------ # Cause the line "VAR=VAL" to be eventually appended to ${config_file}. AC_DEFUN([GIT_CONF_SUBST], - [AC_REQUIRE([GIT_CONF_SUBST_INIT]) - config_appended_defs="$config_appended_defs${newline}$1=$2"]) +[AC_REQUIRE([GIT_CONF_SUBST_INIT]) +config_appended_defs="$config_appended_defs${newline}dnl +$1=m4_if([$#],[1],[${$1}],[$2])"]) # GIT_CONF_SUBST_INIT # ------------------- @@ -179,7 +180,7 @@ AC_ARG_WITH([lib], else lib=$withval AC_MSG_NOTICE([Setting lib to '$lib']) - GIT_CONF_SUBST([lib], [$withval]) + GIT_CONF_SUBST([lib]) fi]) if test -z "$lib"; then @@ -215,7 +216,7 @@ AC_ARG_ENABLE([jsmin], [ JSMIN=$enableval; AC_MSG_NOTICE([Setting JSMIN to '$JSMIN' to enable JavaScript minifying]) - GIT_CONF_SUBST([JSMIN], [$enableval]) + GIT_CONF_SUBST([JSMIN]) ]) # Define option to enable CSS minification @@ -225,7 +226,7 @@ AC_ARG_ENABLE([cssmin], [ CSSMIN=$enableval; AC_MSG_NOTICE([Setting CSSMIN to '$CSSMIN' to enable CSS minifying]) - GIT_CONF_SUBST([CSSMIN], [$enableval]) + GIT_CONF_SUBST([CSSMIN]) ]) ## Site configuration (override autodetection) @@ -265,8 +266,10 @@ AS_HELP_STRING([], [ARG can be also prefix for libpcre library and hea else USE_LIBPCRE=YesPlease LIBPCREDIR=$withval - AC_MSG_NOTICE([Setting LIBPCREDIR to $withval]) - GIT_CONF_SUBST([LIBPCREDIR], [$withval]) + AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR]) + dnl USE_LIBPCRE can still be modified below, so don't substitute + dnl it yet. + GIT_CONF_SUBST([LIBPCREDIR]) fi) # # Define NO_CURL if you do not have curl installed. git-http-pull and @@ -386,9 +389,10 @@ AC_MSG_NOTICE([CHECKS for programs]) AC_PROG_CC([cc gcc]) AC_C_INLINE case $ac_cv_c_inline in - inline | yes | no) ;; - *) AC_SUBST([INLINE], [$ac_cv_c_inline]) ;; + inline | yes | no) INLINE='';; + *) INLINE=$ac_cv_c_inline ;; esac +GIT_CONF_SUBST([INLINE]) # which switch to pass runtime path to dynamic libraries to the linker AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ @@ -398,7 +402,7 @@ AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_dashr" = "yes"; then - AC_SUBST(CC_LD_DYNPATH, [-R]) + CC_LD_DYNPATH=-R else AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" @@ -407,7 +411,7 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then - AC_SUBST(CC_LD_DYNPATH, [-Wl,-rpath,]) + CC_LD_DYNPATH=-Wl,-rpath else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" @@ -416,32 +420,35 @@ else LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_rpath" = "yes"; then - AC_SUBST(CC_LD_DYNPATH, [-rpath]) + CC_LD_DYNPATH=-rpath else + CC_LD_DYNPATH= AC_MSG_WARN([linker does not support runtime path to dynamic libraries]) fi fi fi +GIT_CONF_SUBST([CC_LD_DYNPATH]) #AC_PROG_INSTALL # needs install-sh or install.sh in sources AC_CHECK_TOOLS(AR, [gar ar], :) AC_CHECK_PROGS(TAR, [gtar tar]) AC_CHECK_PROGS(DIFF, [gnudiff gdiff diff]) # TCLTK_PATH will be set to some value if we want Tcl/Tk # or will be empty otherwise. -if test -z "$NO_TCLTK"; then +if test -n "$NO_TCLTK"; then + TCLTK_PATH= +else if test "$with_tcltk" = ""; then # No Tcl/Tk switches given. Do not check for Tcl/Tk, use bare 'wish'. TCLTK_PATH=wish - AC_SUBST(TCLTK_PATH) elif test "$with_tcltk" = "yes"; then # Tcl/Tk check requested. AC_CHECK_PROGS(TCLTK_PATH, [wish], ) else AC_MSG_RESULT([Using Tcl/Tk interpreter $with_tcltk]) TCLTK_PATH="$with_tcltk" - AC_SUBST(TCLTK_PATH) fi fi +GIT_CONF_SUBST([TCLTK_PATH]) AC_CHECK_PROGS(ASCIIDOC, [asciidoc]) if test -n "$ASCIIDOC"; then AC_MSG_CHECKING([for asciidoc version]) @@ -468,13 +475,13 @@ GIT_STASH_FLAGS($OPENSSLDIR) AC_CHECK_LIB([crypto], [SHA1_Init], [NEEDS_SSL_WITH_CRYPTO=], [AC_CHECK_LIB([ssl], [SHA1_Init], - [NEEDS_SSL_WITH_CRYPTO=YesPlease], - [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) + [NEEDS_SSL_WITH_CRYPTO=YesPlease NO_OPENSSL=], + [NEEDS_SSL_WITH_CRYPTO= NO_OPENSSL=YesPlease])]) GIT_UNSTASH_FLAGS($OPENSSLDIR) -AC_SUBST(NEEDS_SSL_WITH_CRYPTO) -AC_SUBST(NO_OPENSSL) +GIT_CONF_SUBST([NEEDS_SSL_WITH_CRYPTO]) +GIT_CONF_SUBST([NO_OPENSSL]) # # Define USE_LIBPCRE if you have and want to use libpcre. git-grep will be @@ -491,7 +498,7 @@ AC_CHECK_LIB([pcre], [pcre_version], GIT_UNSTASH_FLAGS($LIBPCREDIR) -AC_SUBST(USE_LIBPCRE) +GIT_CONF_SUBST([USE_LIBPCRE]) fi @@ -508,7 +515,7 @@ AC_CHECK_LIB([curl], [curl_global_init], GIT_UNSTASH_FLAGS($CURLDIR) -AC_SUBST(NO_CURL) +GIT_CONF_SUBST([NO_CURL]) # # Define NO_EXPAT if you do not have expat installed. git-http-push is @@ -522,7 +529,7 @@ AC_CHECK_LIB([expat], [XML_ParserCreate], GIT_UNSTASH_FLAGS($EXPATDIR) -AC_SUBST(NO_EXPAT) +GIT_CONF_SUBST([NO_EXPAT]) # # Define NEEDS_LIBICONV if linking with libc is not enough (Darwin and @@ -568,8 +575,8 @@ LIBS="$old_LIBS" GIT_UNSTASH_FLAGS($ICONVDIR) -AC_SUBST(NEEDS_LIBICONV) -AC_SUBST(NO_ICONV) +GIT_CONF_SUBST([NEEDS_LIBICONV]) +GIT_CONF_SUBST([NO_ICONV]) if test -n "$NO_ICONV"; then NEEDS_LIBICONV= @@ -596,7 +603,7 @@ LIBS="$old_LIBS" GIT_UNSTASH_FLAGS($ZLIB_PATH) -AC_SUBST(NO_DEFLATE_BOUND) +GIT_CONF_SUBST([NO_DEFLATE_BOUND]) # # Define NEEDS_SOCKET if linking with libc is not enough (SunOS, @@ -604,7 +611,7 @@ AC_SUBST(NO_DEFLATE_BOUND) AC_CHECK_LIB([c], [socket], [NEEDS_SOCKET=], [NEEDS_SOCKET=YesPlease]) -AC_SUBST(NEEDS_SOCKET) +GIT_CONF_SUBST([NEEDS_SOCKET]) test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket" # @@ -612,40 +619,43 @@ test -n "$NEEDS_SOCKET" && LIBS="$LIBS -lsocket" # libresolv provides some of the functions we would normally get # from libc. NEEDS_RESOLV= -AC_SUBST(NEEDS_RESOLV) # # Define NO_INET_NTOP if linking with -lresolv is not enough. # Solaris 2.7 in particular hos inet_ntop in -lresolv. NO_INET_NTOP= -AC_SUBST(NO_INET_NTOP) AC_CHECK_FUNC([inet_ntop], - [], + [], [AC_CHECK_LIB([resolv], [inet_ntop], - [NEEDS_RESOLV=YesPlease], + [NEEDS_RESOLV=YesPlease], [NO_INET_NTOP=YesPlease]) ]) +GIT_CONF_SUBST([NO_INET_NTOP]) # # Define NO_INET_PTON if linking with -lresolv is not enough. # Solaris 2.7 in particular hos inet_pton in -lresolv. NO_INET_PTON= -AC_SUBST(NO_INET_PTON) AC_CHECK_FUNC([inet_pton], - [], + [], [AC_CHECK_LIB([resolv], [inet_pton], - [NEEDS_RESOLV=YesPlease], + [NEEDS_RESOLV=YesPlease], [NO_INET_PTON=YesPlease]) ]) +GIT_CONF_SUBST([NO_INET_PTON]) # # Define NO_HSTRERROR if linking with -lresolv is not enough. # Solaris 2.6 in particular has no hstrerror, even in -lresolv. NO_HSTRERROR= AC_CHECK_FUNC([hstrerror], - [], + [], [AC_CHECK_LIB([resolv], [hstrerror], - [NEEDS_RESOLV=YesPlease], + [NEEDS_RESOLV=YesPlease], [NO_HSTRERROR=YesPlease]) ]) -AC_SUBST(NO_HSTRERROR) +GIT_CONF_SUBST([NO_HSTRERROR]) + +dnl This must go after all the possible places for its initialization, +dnl in the AC_CHECK_FUNC invocations above. +GIT_CONF_SUBST([NEEDS_RESOLV]) # # If any of the above tests determined that -lresolv is needed at # build-time, also set it here for remaining configure-time checks. @@ -654,13 +664,13 @@ test -n "$NEEDS_RESOLV" && LIBS="$LIBS -lresolv" AC_CHECK_LIB([c], [basename], [NEEDS_LIBGEN=], [NEEDS_LIBGEN=YesPlease]) -AC_SUBST(NEEDS_LIBGEN) +GIT_CONF_SUBST([NEEDS_LIBGEN]) test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" AC_CHECK_LIB([c], [gettext], [LIBC_CONTAINS_LIBINTL=YesPlease], [LIBC_CONTAINS_LIBINTL=]) -AC_SUBST(LIBC_CONTAINS_LIBINTL) +GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL]) # # Define NO_GETTEXT if you don't want Git output to be translated. @@ -668,7 +678,7 @@ AC_SUBST(LIBC_CONTAINS_LIBINTL) AC_CHECK_HEADER([libintl.h], [NO_GETTEXT=], [NO_GETTEXT=YesPlease]) -AC_SUBST(NO_GETTEXT) +GIT_CONF_SUBST([NO_GETTEXT]) if test -z "$NO_GETTEXT"; then test -n "$LIBC_CONTAINS_LIBINTL" || LIBS="$LIBS -lintl" @@ -681,19 +691,19 @@ AC_MSG_NOTICE([CHECKS for header files]) AC_CHECK_HEADER([sys/select.h], [NO_SYS_SELECT_H=], [NO_SYS_SELECT_H=UnfortunatelyYes]) -AC_SUBST(NO_SYS_SELECT_H) +GIT_CONF_SUBST([NO_SYS_SELECT_H]) # # Define NO_SYS_POLL_H if you don't have sys/poll.h AC_CHECK_HEADER([sys/poll.h], [NO_SYS_POLL_H=], [NO_SYS_POLL_H=UnfortunatelyYes]) -AC_SUBST(NO_SYS_POLL_H) +GIT_CONF_SUBST([NO_SYS_POLL_H]) # # Define NO_INTTYPES_H if you don't have inttypes.h AC_CHECK_HEADER([inttypes.h], [NO_INTTYPES_H=], [NO_INTTYPES_H=UnfortunatelyYes]) -AC_SUBST(NO_INTTYPES_H) +GIT_CONF_SUBST([NO_INTTYPES_H]) # # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). @@ -716,23 +726,24 @@ AC_COMPILE_IFELSE([OLDICONVTEST_SRC], GIT_UNSTASH_FLAGS($ICONVDIR) -AC_SUBST(OLD_ICONV) +GIT_CONF_SUBST([OLD_ICONV]) ## Checks for typedefs, structures, and compiler characteristics. AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics]) # TYPE_SOCKLEN_T case $ac_cv_type_socklen_t in - yes) ;; - *) AC_SUBST([SOCKLEN_T], [$git_cv_socklen_t_equiv]) ;; + yes) SOCKLEN_T='';; + *) SOCKLEN_T=$git_cv_socklen_t_equiv;; esac +GIT_CONF_SUBST([SOCKLEN_T]) # Define NO_D_INO_IN_DIRENT if you don't have d_ino in your struct dirent. AC_CHECK_MEMBER(struct dirent.d_ino, [NO_D_INO_IN_DIRENT=], [NO_D_INO_IN_DIRENT=YesPlease], [#include <dirent.h>]) -AC_SUBST(NO_D_INO_IN_DIRENT) +GIT_CONF_SUBST([NO_D_INO_IN_DIRENT]) # # Define NO_D_TYPE_IN_DIRENT if your platform defines DT_UNKNOWN but lacks # d_type in struct dirent (latest Cygwin -- will be fixed soonish). @@ -740,7 +751,7 @@ AC_CHECK_MEMBER(struct dirent.d_type, [NO_D_TYPE_IN_DIRENT=], [NO_D_TYPE_IN_DIRENT=YesPlease], [#include <dirent.h>]) -AC_SUBST(NO_D_TYPE_IN_DIRENT) +GIT_CONF_SUBST([NO_D_TYPE_IN_DIRENT]) # # Define NO_SOCKADDR_STORAGE if your platform does not have struct # sockaddr_storage. @@ -750,7 +761,7 @@ AC_CHECK_TYPE(struct sockaddr_storage, #include <sys/types.h> #include <sys/socket.h> ]) -AC_SUBST(NO_SOCKADDR_STORAGE) +GIT_CONF_SUBST([NO_SOCKADDR_STORAGE]) # # Define NO_IPV6 if you lack IPv6 support and getaddrinfo(). AC_CHECK_TYPE([struct addrinfo],[ @@ -762,7 +773,7 @@ AC_CHECK_TYPE([struct addrinfo],[ #include <sys/socket.h> #include <netdb.h> ]) -AC_SUBST(NO_IPV6) +GIT_CONF_SUBST([NO_IPV6]) # # Define NO_REGEX if you have no or inferior regex support in your C library. AC_CACHE_CHECK([whether the platform regex can handle null bytes], @@ -783,7 +794,7 @@ if test $ac_cv_c_excellent_regex = yes; then else NO_REGEX=YesPlease fi -AC_SUBST(NO_REGEX) +GIT_CONF_SUBST([NO_REGEX]) # # Define FREAD_READS_DIRECTORIES if your are on a system which succeeds # when attempting to read from an fopen'ed directory. @@ -803,7 +814,7 @@ if test $ac_cv_fread_reads_directories = yes; then else FREAD_READS_DIRECTORIES= fi -AC_SUBST(FREAD_READS_DIRECTORIES) +GIT_CONF_SUBST([FREAD_READS_DIRECTORIES]) # # Define SNPRINTF_RETURNS_BOGUS if your are on a system which snprintf() # or vsnprintf() return -1 instead of number of characters which would @@ -837,7 +848,7 @@ if test $ac_cv_snprintf_returns_bogus = yes; then else SNPRINTF_RETURNS_BOGUS= fi -AC_SUBST(SNPRINTF_RETURNS_BOGUS) +GIT_CONF_SUBST([SNPRINTF_RETURNS_BOGUS]) ## Checks for library functions. @@ -848,47 +859,45 @@ AC_MSG_NOTICE([CHECKS for library functions]) AC_CHECK_HEADER([libgen.h], [NO_LIBGEN_H=], [NO_LIBGEN_H=YesPlease]) -AC_SUBST(NO_LIBGEN_H) +GIT_CONF_SUBST([NO_LIBGEN_H]) # # Define HAVE_PATHS_H if you have paths.h. AC_CHECK_HEADER([paths.h], [HAVE_PATHS_H=YesPlease], [HAVE_PATHS_H=]) -AC_SUBST(HAVE_PATHS_H) +GIT_CONF_SUBST([HAVE_PATHS_H]) # # Define HAVE_LIBCHARSET_H if have libcharset.h AC_CHECK_HEADER([libcharset.h], [HAVE_LIBCHARSET_H=YesPlease], [HAVE_LIBCHARSET_H=]) -AC_SUBST(HAVE_LIBCHARSET_H) +GIT_CONF_SUBST([HAVE_LIBCHARSET_H]) # Define CHARSET_LIB if libiconv does not export the locale_charset symbol # and libcharset does CHARSET_LIB= AC_CHECK_LIB([iconv], [locale_charset], [], [AC_CHECK_LIB([charset], [locale_charset], - [CHARSET_LIB=-lcharset]) - ] -) -AC_SUBST(CHARSET_LIB) + [CHARSET_LIB=-lcharset])]) +GIT_CONF_SUBST([CHARSET_LIB]) # # Define NO_STRCASESTR if you don't have strcasestr. GIT_CHECK_FUNC(strcasestr, [NO_STRCASESTR=], [NO_STRCASESTR=YesPlease]) -AC_SUBST(NO_STRCASESTR) +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]) -AC_SUBST(NO_STRTOK_R) +GIT_CONF_SUBST([NO_STRTOK_R]) # # Define NO_FNMATCH if you don't have fnmatch GIT_CHECK_FUNC(fnmatch, [NO_FNMATCH=], [NO_FNMATCH=YesPlease]) -AC_SUBST(NO_FNMATCH) +GIT_CONF_SUBST([NO_FNMATCH]) # # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the # FNM_CASEFOLD GNU extension. @@ -910,19 +919,19 @@ if test $ac_cv_c_excellent_fnmatch = yes; then else NO_FNMATCH_CASEFOLD=YesPlease fi -AC_SUBST(NO_FNMATCH_CASEFOLD) +GIT_CONF_SUBST([NO_FNMATCH_CASEFOLD]) # # Define NO_MEMMEM if you don't have memmem. GIT_CHECK_FUNC(memmem, [NO_MEMMEM=], [NO_MEMMEM=YesPlease]) -AC_SUBST(NO_MEMMEM) +GIT_CONF_SUBST([NO_MEMMEM]) # # Define NO_STRLCPY if you don't have strlcpy. GIT_CHECK_FUNC(strlcpy, [NO_STRLCPY=], [NO_STRLCPY=YesPlease]) -AC_SUBST(NO_STRLCPY) +GIT_CONF_SUBST([NO_STRLCPY]) # # Define NO_UINTMAX_T if your platform does not have uintmax_t AC_CHECK_TYPE(uintmax_t, @@ -930,43 +939,43 @@ AC_CHECK_TYPE(uintmax_t, [NO_UINTMAX_T=YesPlease],[ #include <inttypes.h> ]) -AC_SUBST(NO_UINTMAX_T) +GIT_CONF_SUBST([NO_UINTMAX_T]) # # Define NO_STRTOUMAX if you don't have strtoumax in the C library. GIT_CHECK_FUNC(strtoumax, [NO_STRTOUMAX=], [NO_STRTOUMAX=YesPlease]) -AC_SUBST(NO_STRTOUMAX) +GIT_CONF_SUBST([NO_STRTOUMAX]) # # Define NO_SETENV if you don't have setenv in the C library. GIT_CHECK_FUNC(setenv, [NO_SETENV=], [NO_SETENV=YesPlease]) -AC_SUBST(NO_SETENV) +GIT_CONF_SUBST([NO_SETENV]) # # Define NO_UNSETENV if you don't have unsetenv in the C library. GIT_CHECK_FUNC(unsetenv, [NO_UNSETENV=], [NO_UNSETENV=YesPlease]) -AC_SUBST(NO_UNSETENV) +GIT_CONF_SUBST([NO_UNSETENV]) # # Define NO_MKDTEMP if you don't have mkdtemp in the C library. GIT_CHECK_FUNC(mkdtemp, [NO_MKDTEMP=], [NO_MKDTEMP=YesPlease]) -AC_SUBST(NO_MKDTEMP) +GIT_CONF_SUBST([NO_MKDTEMP]) # # Define NO_MKSTEMPS if you don't have mkstemps in the C library. GIT_CHECK_FUNC(mkstemps, [NO_MKSTEMPS=], [NO_MKSTEMPS=YesPlease]) -AC_SUBST(NO_MKSTEMPS) +GIT_CONF_SUBST([NO_MKSTEMPS]) # # Define NO_INITGROUPS if you don't have initgroups in the C library. GIT_CHECK_FUNC(initgroups, [NO_INITGROUPS=], [NO_INITGROUPS=YesPlease]) -AC_SUBST(NO_INITGROUPS) +GIT_CONF_SUBST([NO_INITGROUPS]) # # # Define NO_MMAP if you want to avoid mmap. @@ -1048,9 +1057,9 @@ fi CFLAGS="$old_CFLAGS" -AC_SUBST(PTHREAD_CFLAGS) -AC_SUBST(PTHREAD_LIBS) -AC_SUBST(NO_PTHREADS) +GIT_CONF_SUBST([PTHREAD_CFLAGS]) +GIT_CONF_SUBST([PTHREAD_LIBS]) +GIT_CONF_SUBST([NO_PTHREADS]) ## Output files AC_CONFIG_FILES(["${config_file}":"${config_in}"]) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 222b804ce4..c48cd19f12 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -225,6 +225,13 @@ _get_comp_words_by_ref () fi fi +# Quotes the argument for shell reuse +__git_quote() +{ + local quoted=${1//\'/\'\\\'\'} + printf "'%s'" "$quoted" +} + # Generates completion reply with compgen, appending a space to possible # completion words, if necessary. # It accepts 1 to 4 arguments: @@ -261,7 +268,7 @@ __gitcomp () __gitcomp_nl () { local IFS=$'\n' - COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}")) + COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}")) } __git_heads () @@ -875,11 +882,15 @@ _git_branch () done case "$cur" in + --set-upstream-to=*) + __gitcomp "$(__git_refs)" "" "${cur##--set-upstream-to=}" + ;; --*) __gitcomp " --color --no-color --verbose --abbrev= --no-abbrev --track --no-track --contains --merged --no-merged - --set-upstream --edit-description --list + --set-upstream-to= --edit-description --list + --unset-upstream " ;; *) @@ -1014,7 +1025,8 @@ _git_commit () --*) __gitcomp " --all --author= --signoff --verify --no-verify - --edit --amend --include --only --interactive + --edit --no-edit + --amend --include --only --interactive --dry-run --reuse-message= --reedit-message= --reset-author --file= --message= --template= --cleanup= --untracked-files --untracked-files= @@ -2032,7 +2044,7 @@ _git_config () _git_remote () { - local subcommands="add rename rm set-head set-branches set-url show prune update" + local subcommands="add rename remove set-head set-branches set-url show prune update" local subcommand="$(__git_find_on_cmdline "$subcommands")" if [ -z "$subcommand" ]; then __gitcomp "$subcommands" @@ -2040,7 +2052,7 @@ _git_remote () fi case "$subcommand" in - rename|rm|set-url|show|prune) + rename|remove|set-url|show|prune) __gitcomp_nl "$(__git_remotes)" ;; set-head|set-branches) diff --git a/contrib/credential/gnome-keyring/.gitignore b/contrib/credential/gnome-keyring/.gitignore new file mode 100644 index 0000000000..88d8fcdbce --- /dev/null +++ b/contrib/credential/gnome-keyring/.gitignore @@ -0,0 +1 @@ +git-credential-gnome-keyring diff --git a/contrib/credential/gnome-keyring/Makefile b/contrib/credential/gnome-keyring/Makefile new file mode 100644 index 0000000000..e6561d8db6 --- /dev/null +++ b/contrib/credential/gnome-keyring/Makefile @@ -0,0 +1,24 @@ +MAIN:=git-credential-gnome-keyring +all:: $(MAIN) + +CC = gcc +RM = rm -f +CFLAGS = -g -O2 -Wall + +-include ../../../config.mak.autogen +-include ../../../config.mak + +INCS:=$(shell pkg-config --cflags gnome-keyring-1) +LIBS:=$(shell pkg-config --libs gnome-keyring-1) + +SRCS:=$(MAIN).c +OBJS:=$(SRCS:.c=.o) + +%.o: %.c + $(CC) $(CFLAGS) $(CPPFLAGS) $(INCS) -o $@ -c $< + +$(MAIN): $(OBJS) + $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) + +clean: + @$(RM) $(MAIN) $(OBJS) diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c new file mode 100644 index 0000000000..41f61c5db3 --- /dev/null +++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c @@ -0,0 +1,445 @@ +/* + * Copyright (C) 2011 John Szakmeister <john@szakmeister.net> + * 2012 Philipp A. Hartmann <pah@qo.cx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/* + * Credits: + * - GNOME Keyring API handling originally written by John Szakmeister + * - ported to credential helper API by Philipp A. Hartmann + */ + +#include <stdio.h> +#include <string.h> +#include <stdarg.h> +#include <stdlib.h> +#include <errno.h> +#include <gnome-keyring.h> + +/* + * This credential struct and API is simplified from git's credential.{h,c} + */ +struct credential +{ + char *protocol; + char *host; + unsigned short port; + char *path; + char *username; + char *password; +}; + +#define CREDENTIAL_INIT \ + { NULL,NULL,0,NULL,NULL,NULL } + +void credential_init(struct credential *c); +void credential_clear(struct credential *c); +int credential_read(struct credential *c); +void credential_write(const struct credential *c); + +typedef int (*credential_op_cb)(struct credential*); + +struct credential_operation +{ + char *name; + credential_op_cb op; +}; + +#define CREDENTIAL_OP_END \ + { NULL,NULL } + +/* + * Table with operation callbacks is defined in concrete + * credential helper implementation and contains entries + * like { "get", function_to_get_credential } terminated + * by CREDENTIAL_OP_END. + */ +struct credential_operation const credential_helper_ops[]; + +/* ---------------- common helper functions ----------------- */ + +static inline void free_password(char *password) +{ + char *c = password; + if (!password) + return; + + while (*c) *c++ = '\0'; + free(password); +} + +static inline void warning(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + fprintf(stderr, "warning: "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n" ); + va_end(ap); +} + +static inline void error(const char *fmt, ...) +{ + va_list ap; + + va_start(ap, fmt); + fprintf(stderr, "error: "); + vfprintf(stderr, fmt, ap); + fprintf(stderr, "\n" ); + va_end(ap); +} + +static inline void die(const char *fmt, ...) +{ + va_list ap; + + va_start(ap,fmt); + error(fmt, ap); + va_end(ap); + exit(EXIT_FAILURE); +} + +static inline void die_errno(int err) +{ + error("%s", strerror(err)); + exit(EXIT_FAILURE); +} + +static inline char *xstrdup(const char *str) +{ + char *ret = strdup(str); + if (!ret) + die_errno(errno); + + return ret; +} + +/* ----------------- GNOME Keyring functions ----------------- */ + +/* create a special keyring option string, if path is given */ +static char* keyring_object(struct credential *c) +{ + char* object = NULL; + + if (!c->path) + return object; + + object = (char*) malloc(strlen(c->host)+strlen(c->path)+8); + if(!object) + die_errno(errno); + + if(c->port) + sprintf(object,"%s:%hd/%s",c->host,c->port,c->path); + else + sprintf(object,"%s/%s",c->host,c->path); + + return object; +} + +int keyring_get(struct credential *c) +{ + char* object = NULL; + GList *entries; + GnomeKeyringNetworkPasswordData *password_data; + GnomeKeyringResult result; + + if (!c->protocol || !(c->host || c->path)) + return EXIT_FAILURE; + + object = keyring_object(c); + + result = gnome_keyring_find_network_password_sync( + c->username, + NULL /* domain */, + c->host, + object, + c->protocol, + NULL /* authtype */, + c->port, + &entries); + + free(object); + + if (result == GNOME_KEYRING_RESULT_NO_MATCH) + return EXIT_SUCCESS; + + if (result == GNOME_KEYRING_RESULT_CANCELLED) + return EXIT_SUCCESS; + + if (result != GNOME_KEYRING_RESULT_OK) { + error("%s",gnome_keyring_result_to_message(result)); + return EXIT_FAILURE; + } + + /* pick the first one from the list */ + password_data = (GnomeKeyringNetworkPasswordData *) entries->data; + + free_password(c->password); + c->password = xstrdup(password_data->password); + + if (!c->username) + c->username = xstrdup(password_data->user); + + gnome_keyring_network_password_list_free(entries); + + return EXIT_SUCCESS; +} + + +int keyring_store(struct credential *c) +{ + guint32 item_id; + char *object = NULL; + + /* + * Sanity check that what we are storing is actually sensible. + * In particular, we can't make a URL without a protocol field. + * Without either a host or pathname (depending on the scheme), + * we have no primary key. And without a username and password, + * we are not actually storing a credential. + */ + if (!c->protocol || !(c->host || c->path) || + !c->username || !c->password) + return EXIT_FAILURE; + + object = keyring_object(c); + + gnome_keyring_set_network_password_sync( + GNOME_KEYRING_DEFAULT, + c->username, + NULL /* domain */, + c->host, + object, + c->protocol, + NULL /* authtype */, + c->port, + c->password, + &item_id); + + free(object); + return EXIT_SUCCESS; +} + +int keyring_erase(struct credential *c) +{ + char *object = NULL; + GList *entries; + GnomeKeyringNetworkPasswordData *password_data; + GnomeKeyringResult result; + + /* + * Sanity check that we actually have something to match + * against. The input we get is a restrictive pattern, + * so technically a blank credential means "erase everything". + * But it is too easy to accidentally send this, since it is equivalent + * to empty input. So explicitly disallow it, and require that the + * pattern have some actual content to match. + */ + if (!c->protocol && !c->host && !c->path && !c->username) + return EXIT_FAILURE; + + object = keyring_object(c); + + result = gnome_keyring_find_network_password_sync( + c->username, + NULL /* domain */, + c->host, + object, + c->protocol, + NULL /* authtype */, + c->port, + &entries); + + free(object); + + if (result == GNOME_KEYRING_RESULT_NO_MATCH) + return EXIT_SUCCESS; + + if (result == GNOME_KEYRING_RESULT_CANCELLED) + return EXIT_SUCCESS; + + if (result != GNOME_KEYRING_RESULT_OK) + { + error("%s",gnome_keyring_result_to_message(result)); + return EXIT_FAILURE; + } + + /* pick the first one from the list (delete all matches?) */ + password_data = (GnomeKeyringNetworkPasswordData *) entries->data; + + result = gnome_keyring_item_delete_sync( + password_data->keyring, password_data->item_id); + + gnome_keyring_network_password_list_free(entries); + + if (result != GNOME_KEYRING_RESULT_OK) + { + error("%s",gnome_keyring_result_to_message(result)); + return EXIT_FAILURE; + } + + return EXIT_SUCCESS; +} + +/* + * Table with helper operation callbacks, used by generic + * credential helper main function. + */ +struct credential_operation const credential_helper_ops[] = +{ + { "get", keyring_get }, + { "store", keyring_store }, + { "erase", keyring_erase }, + CREDENTIAL_OP_END +}; + +/* ------------------ credential functions ------------------ */ + +void credential_init(struct credential *c) +{ + memset(c, 0, sizeof(*c)); +} + +void credential_clear(struct credential *c) +{ + free(c->protocol); + free(c->host); + free(c->path); + free(c->username); + free_password(c->password); + + credential_init(c); +} + +int credential_read(struct credential *c) +{ + char buf[1024]; + ssize_t line_len = 0; + char *key = buf; + char *value; + + while (fgets(buf, sizeof(buf), stdin)) + { + line_len = strlen(buf); + + if(buf[line_len-1]=='\n') + buf[--line_len]='\0'; + + if(!line_len) + break; + + value = strchr(buf,'='); + if(!value) { + warning("invalid credential line: %s", key); + return -1; + } + *value++ = '\0'; + + if (!strcmp(key, "protocol")) { + free(c->protocol); + c->protocol = xstrdup(value); + } else if (!strcmp(key, "host")) { + free(c->host); + c->host = xstrdup(value); + value = strrchr(c->host,':'); + if (value) { + *value++ = '\0'; + c->port = atoi(value); + } + } else if (!strcmp(key, "path")) { + free(c->path); + c->path = xstrdup(value); + } else if (!strcmp(key, "username")) { + free(c->username); + c->username = xstrdup(value); + } else if (!strcmp(key, "password")) { + free_password(c->password); + c->password = xstrdup(value); + while (*value) *value++ = '\0'; + } + /* + * Ignore other lines; we don't know what they mean, but + * this future-proofs us when later versions of git do + * learn new lines, and the helpers are updated to match. + */ + } + return 0; +} + +void credential_write_item(FILE *fp, const char *key, const char *value) +{ + if (!value) + return; + fprintf(fp, "%s=%s\n", key, value); +} + +void credential_write(const struct credential *c) +{ + /* only write username/password, if set */ + credential_write_item(stdout, "username", c->username); + credential_write_item(stdout, "password", c->password); +} + +static void usage(const char *name) +{ + struct credential_operation const *try_op = credential_helper_ops; + const char *basename = strrchr(name,'/'); + + basename = (basename) ? basename + 1 : name; + fprintf(stderr, "Usage: %s <", basename); + while(try_op->name) { + fprintf(stderr,"%s",(try_op++)->name); + if(try_op->name) + fprintf(stderr,"%s","|"); + } + fprintf(stderr,"%s",">\n"); +} + +int main(int argc, char *argv[]) +{ + int ret = EXIT_SUCCESS; + + struct credential_operation const *try_op = credential_helper_ops; + struct credential cred = CREDENTIAL_INIT; + + if (!argv[1]) { + usage(argv[0]); + goto out; + } + + /* lookup operation callback */ + while(try_op->name && strcmp(argv[1], try_op->name)) + try_op++; + + /* unsupported operation given -- ignore silently */ + if(!try_op->name || !try_op->op) + goto out; + + ret = credential_read(&cred); + if(ret) + goto out; + + /* perform credential operation */ + ret = (*try_op->op)(&cred); + + credential_write(&cred); + +out: + credential_clear(&cred); + return ret; +} diff --git a/contrib/examples/builtin-fetch--tool.c b/contrib/examples/builtin-fetch--tool.c index 0d54aa7061..8bc8c7533a 100644 --- a/contrib/examples/builtin-fetch--tool.c +++ b/contrib/examples/builtin-fetch--tool.c @@ -96,7 +96,7 @@ static int update_local_ref(const char *name, strcpy(oldh, find_unique_abbrev(current->object.sha1, DEFAULT_ABBREV)); strcpy(newh, find_unique_abbrev(sha1_new, DEFAULT_ABBREV)); - if (in_merge_bases(current, &updated, 1)) { + if (in_merge_bases(current, updated)) { fprintf(stderr, "* %s: fast-forward to %s\n", name, note); fprintf(stderr, " old..new: %s..%s\n", oldh, newh); diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump index a33674e47a..dc90cd6379 100755 --- a/contrib/git-jump/git-jump +++ b/contrib/git-jump/git-jump @@ -21,9 +21,9 @@ open_editor() { } mode_diff() { - git diff --relative "$@" | + git diff --no-prefix --relative "$@" | perl -ne ' - if (m{^\+\+\+ b/(.*)}) { $file = $1; next } + if (m{^\+\+\+ (.*)}) { $file = $1; next } defined($file) or next; if (m/^@@ .*\+(\d+)/) { $line = $1; next } defined($line) or next; @@ -25,7 +25,7 @@ static int diff_detect_rename_default; static int diff_rename_limit_default = 400; static int diff_suppress_blank_empty; -int diff_use_color_default = -1; +static int diff_use_color_default = -1; static const char *diff_word_regex_cfg; static const char *external_diff_cmd_cfg; int diff_auto_refresh_index = 1; @@ -1398,11 +1398,11 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions) if (!files) { assert(insertions == 0 && deletions == 0); - return fprintf(fp, "%s\n", _(" 0 files changed")); + return fprintf(fp, "%s\n", " 0 files changed"); } strbuf_addf(&sb, - Q_(" %d file changed", " %d files changed", files), + (files == 1) ? " %d file changed" : " %d files changed", files); /* @@ -1419,8 +1419,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions) * do not translate it. */ strbuf_addf(&sb, - Q_(", %d insertion(+)", ", %d insertions(+)", - insertions), + (insertions == 1) ? ", %d insertion(+)" : ", %d insertions(+)", insertions); } @@ -1430,8 +1429,7 @@ int print_stat_summary(FILE *fp, int files, int insertions, int deletions) * do not translate it. */ strbuf_addf(&sb, - Q_(", %d deletion(-)", ", %d deletions(-)", - deletions), + (deletions == 1) ? ", %d deletion(-)" : ", %d deletions(-)", deletions); } strbuf_addch(&sb, '\n'); @@ -243,7 +243,6 @@ extern int parse_long_opt(const char *opt, const char **argv, extern int git_diff_basic_config(const char *var, const char *value, void *cb); extern int git_diff_ui_config(const char *var, const char *value, void *cb); -extern int diff_use_color_default; extern void diff_setup(struct diff_options *); extern int diff_opt_parse(struct diff_options *, const char **, int); extern void diff_setup_done(struct diff_options *); diff --git a/fast-import.c b/fast-import.c index eed97c8fa9..c2a814ec66 100644 --- a/fast-import.c +++ b/fast-import.c @@ -1691,7 +1691,7 @@ static int update_branch(struct branch *b) return error("Branch %s is missing commits.", b->name); } - if (!in_merge_bases(old_cmit, &new_cmit, 1)) { + if (!in_merge_bases(old_cmit, new_cmit)) { unlock_ref(lock); warning("Not updating %s" " (new tip %s does not contain %s)", @@ -4,6 +4,8 @@ #include "git-compat-util.h" #include "gettext.h" +#include "strbuf.h" +#include "utf8.h" #ifndef NO_GETTEXT # include <locale.h> @@ -27,10 +29,9 @@ int use_gettext_poison(void) #endif #ifndef NO_GETTEXT +static const char *charset; static void init_gettext_charset(const char *domain) { - const char *charset; - /* This trick arranges for messages to be emitted in the user's requested encoding, but avoids setting LC_CTYPE from the @@ -128,4 +129,14 @@ void git_setup_gettext(void) init_gettext_charset("git"); textdomain("git"); } + +/* return the number of columns of string 's' in current locale */ +int gettext_width(const char *s) +{ + static int is_utf8 = -1; + if (is_utf8 == -1) + is_utf8 = !strcmp(charset, "UTF-8"); + + return is_utf8 ? utf8_strwidth(s) : strlen(s); +} #endif @@ -30,10 +30,15 @@ #ifndef NO_GETTEXT extern void git_setup_gettext(void); +extern int gettext_width(const char *s); #else static inline void git_setup_gettext(void) { } +static inline int gettext_width(const char *s) +{ + return strlen(s); +} #endif #ifdef GETTEXT_POISON diff --git a/git-compat-util.h b/git-compat-util.h index fd732d7243..24b5432462 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -167,6 +167,17 @@ extern int compat_mkdir_wo_trailing_slash(const char*, mode_t); #endif +#ifdef NO_STRUCT_ITIMERVAL +struct itimerval { + struct timeval it_interval; + struct timeval it_value; +} +#endif + +#ifdef NO_SETITIMER +#define setitimer(which,value,ovalue) +#endif + #ifndef NO_LIBGEN_H #include <libgen.h> #else diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 8d41610bcf..8032f23202 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -889,10 +889,37 @@ sub commit { $xtag =~ s/\s+\*\*.*$//; # Remove stuff like ** INVALID ** and ** FUNKY ** $xtag =~ tr/_/\./ if ( $opt_u ); $xtag =~ s/[\/]/$opt_s/g; - $xtag =~ s/\[//g; - system('git' , 'tag', '-f', $xtag, $cid) == 0 - or die "Cannot create tag $xtag: $!\n"; + # See refs.c for these rules. + # Tag cannot contain bad chars. (See bad_ref_char in refs.c.) + $xtag =~ s/[ ~\^:\\\*\?\[]//g; + # Other bad strings for tags: + # (See check_refname_component in refs.c.) + 1 while $xtag =~ s/ + (?: \.\. # Tag cannot contain '..'. + | \@{ # Tag cannot contain '@{'. + | ^ - # Tag cannot begin with '-'. + | \.lock $ # Tag cannot end with '.lock'. + | ^ \. # Tag cannot begin... + | \. $ # ...or end with '.' + )//xg; + # Tag cannot be empty. + if ($xtag eq '') { + warn("warning: ignoring tag '$tag'", + " with invalid tagname\n"); + return; + } + + if (system('git' , 'tag', '-f', $xtag, $cid) != 0) { + # We did our best to sanitize the tag, but still failed + # for whatever reason. Bail out, and give the user + # enough information to understand if/how we should + # improve the translation in the future. + if ($tag ne $xtag) { + print "Translated '$tag' tag to '$xtag'\n"; + } + die "Cannot create tag $xtag: $!\n"; + } print "Created tag '$xtag' on '$branch'\n" if $opt_v; } @@ -844,6 +844,9 @@ class P4RollBack(Command): return True class P4Submit(Command, P4UserMap): + + conflict_behavior_choices = ("ask", "skip", "quit") + def __init__(self): Command.__init__(self) P4UserMap.__init__(self) @@ -853,12 +856,19 @@ class P4Submit(Command, P4UserMap): # preserve the user, requires relevant p4 permissions optparse.make_option("--preserve-user", dest="preserveUser", action="store_true"), optparse.make_option("--export-labels", dest="exportLabels", action="store_true"), + 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) ] 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.dry_run = False + self.prepare_p4_only = False + self.conflict_behavior = None self.isWindows = (platform.system() == "Windows") self.exportLabels = False self.p4HasMoveCommand = p4_has_command("move") @@ -1088,7 +1098,10 @@ class P4Submit(Command, P4UserMap): return False def applyCommit(self, id): - print "Applying %s" % (read_pipe("git log --max-count=1 --pretty=oneline %s" % id)) + """Apply one commit, return True if it succeeded.""" + + print "Applying", read_pipe(["git", "show", "-s", + "--format=format:%h %s", id]) (p4User, gitEmail) = self.p4UserForCommit(id) @@ -1195,34 +1208,13 @@ class P4Submit(Command, P4UserMap): patch_succeeded = True if not patch_succeeded: - print "What do you want to do?" - response = "x" - while response != "s" and response != "a" and response != "w": - response = raw_input("[s]kip this patch / [a]pply the patch forcibly " - "and with .rej files / [w]rite the patch to a file (patch.txt) ") - if response == "s": - print "Skipping! Good luck with the next patches..." - for f in editedFiles: - p4_revert(f) - for f in filesToAdd: - os.remove(f) - return - elif response == "a": - os.system(applyPatchCmd) - if len(filesToAdd) > 0: - print "You may also want to call p4 add on the following files:" - print " ".join(filesToAdd) - if len(filesToDelete): - print "The following files should be scheduled for deletion with p4 delete:" - print " ".join(filesToDelete) - die("Please resolve and submit the conflict manually and " - + "continue afterwards with git p4 submit --continue") - elif response == "w": - system(diffcmd + " > patch.txt") - print "Patch saved to patch.txt in %s !" % self.clientPath - die("Please resolve and submit the conflict manually and " - "continue afterwards with git p4 submit --continue") + for f in editedFiles: + p4_revert(f) + return False + # + # Apply the patch for real, and do add/delete/+x handling. + # system(applyPatchCmd) for f in filesToAdd: @@ -1236,6 +1228,10 @@ class P4Submit(Command, P4UserMap): mode = filesToChangeExecBit[f] setP4ExecBit(f, mode) + # + # Build p4 change description, starting with the contents + # of the git commit message. + # logMessage = extractLogMessageFromGitCommit(id) logMessage = logMessage.strip() (logMessage, jobs) = self.separate_jobs_from_description(logMessage) @@ -1244,8 +1240,16 @@ class P4Submit(Command, P4UserMap): submitTemplate = self.prepareLogMessage(template, logMessage, jobs) if self.preserveUser: - submitTemplate = submitTemplate + ("\n######## Actual user %s, modified after commit\n" % p4User) + submitTemplate += "\n######## Actual user %s, modified after commit\n" % p4User + + if self.checkAuthorship and not self.p4UserIsMe(p4User): + submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail + submitTemplate += "######## Use option --preserve-user to modify authorship.\n" + submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n" + separatorLine = "######## everything below this line is just the diff #######\n" + + # diff if os.environ.has_key("P4DIFF"): del(os.environ["P4DIFF"]) diff = "" @@ -1253,6 +1257,7 @@ class P4Submit(Command, P4UserMap): diff += p4_read_pipe(['diff', '-du', wildcard_encode(editedFile)]) + # new file diff newdiff = "" for newFile in filesToAdd: newdiff += "==== new file ====\n" @@ -1263,13 +1268,7 @@ class P4Submit(Command, P4UserMap): newdiff += "+" + line f.close() - if self.checkAuthorship and not self.p4UserIsMe(p4User): - submitTemplate += "######## git author %s does not match your p4 account.\n" % gitEmail - submitTemplate += "######## Use option --preserve-user to modify authorship.\n" - submitTemplate += "######## Variable git-p4.skipUserNameCheck hides this message.\n" - - separatorLine = "######## everything below this line is just the diff #######\n" - + # change description file: submitTemplate, separatorLine, diff, newdiff (handle, fileName) = tempfile.mkstemp() tmpFile = os.fdopen(handle, "w+") if self.isWindows: @@ -1279,8 +1278,47 @@ class P4Submit(Command, P4UserMap): tmpFile.write(submitTemplate + separatorLine + diff + newdiff) tmpFile.close() + if self.prepare_p4_only: + # + # Leave the p4 tree prepared, and the submit template around + # and let the user decide what to do next + # + print + print "P4 workspace prepared for submission." + print "To submit or revert, go to client workspace" + print " " + self.clientPath + print + print "To submit, use \"p4 submit\" to write a new description," + print "or \"p4 submit -i %s\" to use the one prepared by" \ + " \"git p4\"." % fileName + print "You can delete the file \"%s\" when finished." % fileName + + if self.preserveUser and p4User and not self.p4UserIsMe(p4User): + print "To preserve change ownership by user %s, you must\n" \ + "do \"p4 change -f <change>\" after submitting and\n" \ + "edit the User field." + if pureRenameCopy: + print "After submitting, renamed files must be re-synced." + print "Invoke \"p4 sync -f\" on each of these files:" + for f in pureRenameCopy: + print " " + f + + print + print "To revert the changes, use \"p4 revert ...\", and delete" + print "the submit template file \"%s\"" % fileName + if filesToAdd: + print "Since the commit adds new files, they must be deleted:" + for f in filesToAdd: + print " " + f + print + return True + + # + # Let the user edit the change description, then submit it. + # if self.edit_template(fileName): # read the edited message and submit + ret = True tmpFile = open(fileName, "rb") message = tmpFile.read() tmpFile.close() @@ -1304,14 +1342,18 @@ class P4Submit(Command, P4UserMap): else: # skip this patch + ret = False print "Submission cancelled, undoing p4 changes." for f in editedFiles: p4_revert(f) for f in filesToAdd: p4_revert(f) os.remove(f) + for f in filesToDelete: + p4_revert(f) os.remove(fileName) + return ret # Export git tags as p4 labels. Create a p4 label and then tag # with that. @@ -1369,14 +1411,20 @@ class P4Submit(Command, P4UserMap): for mapping in clientSpec.mappings: labelTemplate += "\t%s\n" % mapping.depot_side.path - p4_write_pipe(["label", "-i"], labelTemplate) + if self.dry_run: + print "Would create p4 label %s for tag" % name + elif self.prepare_p4_only: + print "Not creating p4 label %s for tag due to option" \ + " --prepare-p4-only" % name + else: + p4_write_pipe(["label", "-i"], labelTemplate) - # Use the label - p4_system(["tag", "-l", name] + - ["%s@%s" % (mapping.depot_side.path, changelist) for mapping in clientSpec.mappings]) + # Use the label + p4_system(["tag", "-l", name] + + ["%s@%s" % (mapping.depot_side.path, changelist) for mapping in clientSpec.mappings]) - if verbose: - print "created p4 label for tag %s" % name + if verbose: + print "created p4 label for tag %s" % name def run(self, args): if len(args) == 0: @@ -1403,6 +1451,16 @@ class P4Submit(Command, P4UserMap): if not self.canChangeChangelists(): die("Cannot preserve user names without p4 super-user or admin permissions") + # if not set from the command line, try the config file + if self.conflict_behavior is None: + val = gitConfig("git-p4.conflict") + if val: + if val not in self.conflict_behavior_choices: + die("Invalid value '%s' for config git-p4.conflict" % val) + else: + val = "ask" + self.conflict_behavior = val + if self.verbose: print "Origin branch is " + self.origin @@ -1435,12 +1493,15 @@ class P4Submit(Command, P4UserMap): os.makedirs(self.clientPath) chdir(self.clientPath) - print "Synchronizing p4 checkout..." - if new_client_dir: - # old one was destroyed, and maybe nobody told p4 - p4_sync("...", "-f") + if self.dry_run: + print "Would synchronize p4 checkout in %s" % self.clientPath else: - p4_sync("...") + print "Synchronizing p4 checkout..." + if new_client_dir: + # old one was destroyed, and maybe nobody told p4 + p4_sync("...", "-f") + else: + p4_sync("...") self.check() commits = [] @@ -1487,14 +1548,64 @@ class P4Submit(Command, P4UserMap): if gitConfig("git-p4.detectCopiesHarder", "--bool") == "true": self.diffOpts += " --find-copies-harder" - while len(commits) > 0: - commit = commits[0] - commits = commits[1:] - self.applyCommit(commit) + # + # Apply the commits, one at a time. On failure, ask if should + # continue to try the rest of the patches, or quit. + # + if self.dry_run: + print "Would apply" + applied = [] + last = len(commits) - 1 + for i, commit in enumerate(commits): + if self.dry_run: + print " ", read_pipe(["git", "show", "-s", + "--format=format:%h %s", commit]) + ok = True + else: + ok = self.applyCommit(commit) + if ok: + applied.append(commit) + else: + if self.prepare_p4_only and i < last: + print "Processing only the first commit due to option" \ + " --prepare-p4-only" + break + if i < last: + quit = False + while True: + # prompt for what to do, or use the option/variable + if self.conflict_behavior == "ask": + print "What do you want to do?" + response = raw_input("[s]kip this commit but apply" + " the rest, or [q]uit? ") + if not response: + continue + elif self.conflict_behavior == "skip": + response = "s" + elif self.conflict_behavior == "quit": + response = "q" + else: + die("Unknown conflict_behavior '%s'" % + self.conflict_behavior) + + if response[0] == "s": + print "Skipping this commit, but applying the rest" + break + if response[0] == "q": + print "Quitting" + quit = True + break + if quit: + break + + chdir(self.oldWorkingDirectory) - if len(commits) == 0: - print "All changes applied!" - chdir(self.oldWorkingDirectory) + if self.dry_run: + pass + elif self.prepare_p4_only: + pass + elif len(commits) == len(applied): + print "All commits applied!" sync = P4Sync() sync.run([]) @@ -1502,6 +1613,20 @@ class P4Submit(Command, P4UserMap): rebase = P4Rebase() rebase.rebase() + else: + if len(applied) == 0: + print "No commits applied." + else: + print "Applied only the commits marked with '*':" + for c in commits: + if c in applied: + star = "*" + else: + star = " " + print star, read_pipe(["git", "show", "-s", + "--format=format:%h %s", c]) + print "You will have to do 'git p4 sync' and rebase." + if gitConfig("git-p4.exportLabels", "--bool") == "true": self.exportLabels = True @@ -1512,6 +1637,10 @@ class P4Submit(Command, P4UserMap): missingGitTags = gitTags - p4Labels self.exportGitTags(missingGitTags) + # exit with error unless everything applied perfecly + if len(commits) != len(applied): + sys.exit(1) + return True class View(object): @@ -3015,7 +3144,7 @@ def main(): args = sys.argv[2:] - options.append(optparse.make_option("--verbose", dest="verbose", action="store_true")) + options.append(optparse.make_option("--verbose", "-v", dest="verbose", action="store_true")) if cmd.needsGit: options.append(optparse.make_option("--git-dir", dest="gitdir")) diff --git a/git-send-email.perl b/git-send-email.perl index 607137b9aa..aea66a0d47 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -759,7 +759,8 @@ if (!defined $sender) { } if (!@initial_to && !defined $to_cmd) { - my $to = ask("Who should the emails be sent to? ", + my $to = ask("Who should the emails be sent to (if any)? ", + default => "", valid_re => qr/\@.*\./, confirm_only => 1); push @initial_to, parse_address_line($to) if defined $to; # sanitized/validated later $prompting++; @@ -786,7 +787,8 @@ sub expand_one_alias { if ($thread && !defined $initial_reply_to && $prompting) { $initial_reply_to = ask( - "Message-ID to be used as In-Reply-To for the first email? ", + "Message-ID to be used as In-Reply-To for the first email (if any)? ", + default => "", valid_re => qr/\@.*\./, confirm_only => 1); } if (defined $initial_reply_to) { diff --git a/gitk-git/gitk b/gitk-git/gitk index 22270ce46b..d93bd990a9 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2038,7 +2038,7 @@ proc makewindow {} { set file { mc "File" cascade { {mc "Update" command updatecommits -accelerator F5} - {mc "Reload" command reloadcommits -accelerator Meta1-F5} + {mc "Reload" command reloadcommits -accelerator Shift-F5} {mc "Reread references" command rereadrefs} {mc "List references" command showrefs -accelerator F2} {xx "" separator} @@ -2495,7 +2495,7 @@ proc makewindow {} { bindkey ? {dofind -1 1} bindkey f nextfile bind . <F5> updatecommits - bind . <$M1B-F5> reloadcommits + bind . <Shift-F5> reloadcommits bind . <F2> showrefs bind . <Shift-F4> {newview 0} catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } @@ -10599,7 +10599,7 @@ proc movedhead {hid head} { } proc changedrefs {} { - global cached_dheads cached_dtags cached_atags + global cached_dheads cached_dtags cached_atags cached_tagcontent global arctags archeads arcnos arcout idheads idtags foreach id [concat [array names idheads] [array names idtags]] { @@ -10611,6 +10611,7 @@ proc changedrefs {} { } } } + catch {unset cached_tagcontent} catch {unset cached_dtags} catch {unset cached_atags} catch {unset cached_dheads} @@ -10663,7 +10664,7 @@ proc listrefs {id} { } proc showtag {tag isnew} { - global ctext tagcontents tagids linknum tagobjid + global ctext cached_tagcontent tagids linknum tagobjid if {$isnew} { addtohistory [list showtag $tag 0] savectextpos @@ -10672,13 +10673,13 @@ proc showtag {tag isnew} { clear_ctext settabs 0 set linknum 0 - if {![info exists tagcontents($tag)]} { + if {![info exists cached_tagcontent($tag)]} { catch { - set tagcontents($tag) [exec git cat-file tag $tag] + set cached_tagcontent($tag) [exec git cat-file tag $tag] } } - if {[info exists tagcontents($tag)]} { - set text $tagcontents($tag) + if {[info exists cached_tagcontent($tag)]} { + set text $cached_tagcontent($tag) } else { set text "[mc "Tag"]: $tag\n[mc "Id"]: $tagids($tag)" } @@ -11532,6 +11533,11 @@ if {[catch {package require Tk 8.4} err]} { exit 1 } +# Unset GIT_TRACE var if set +if { [info exists ::env(GIT_TRACE)] } { + unset ::env(GIT_TRACE) +} + # defaults... set wrcomcmd "git diff-tree --stdin -p --pretty" @@ -8,6 +8,34 @@ /* 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 @@ -62,7 +90,7 @@ enum graph_state { static const char **column_colors; static unsigned short column_colors_max; -void graph_set_column_colors(const char **colors, unsigned short colors_max) +static void graph_set_column_colors(const char **colors, unsigned short colors_max) { column_colors = colors; column_colors_max = colors_max; @@ -1116,7 +1144,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf graph_update_state(graph, GRAPH_PADDING); } -int graph_next_line(struct git_graph *graph, struct strbuf *sb) +static int graph_next_line(struct git_graph *graph, struct strbuf *sb) { switch (graph->state) { case GRAPH_PADDING: @@ -4,22 +4,6 @@ /* 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. - */ -void graph_set_column_colors(const char **colors, unsigned short colors_max); /* * Create a new struct git_graph. @@ -49,17 +33,6 @@ 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. - */ -int graph_next_line(struct git_graph *graph, struct strbuf *sb); - /* * graph_show_*: helper functions for printing to stdout @@ -3,6 +3,10 @@ #include "userdiff.h" #include "xdiff-interface.h" +static int grep_source_load(struct grep_source *gs); +static int grep_source_is_binary(struct grep_source *gs); + + static struct grep_pat *create_grep_pat(const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t, @@ -332,6 +336,87 @@ static struct grep_expr *compile_pattern_expr(struct grep_pat **list) return compile_pattern_or(list); } +static void indent(int in) +{ + while (in-- > 0) + fputc(' ', stderr); +} + +static void dump_grep_pat(struct grep_pat *p) +{ + switch (p->token) { + case GREP_AND: fprintf(stderr, "*and*"); break; + case GREP_OPEN_PAREN: fprintf(stderr, "*(*"); break; + case GREP_CLOSE_PAREN: fprintf(stderr, "*)*"); break; + case GREP_NOT: fprintf(stderr, "*not*"); break; + case GREP_OR: fprintf(stderr, "*or*"); break; + + case GREP_PATTERN: fprintf(stderr, "pattern"); break; + case GREP_PATTERN_HEAD: fprintf(stderr, "pattern_head"); break; + case GREP_PATTERN_BODY: fprintf(stderr, "pattern_body"); break; + } + + switch (p->token) { + default: break; + case GREP_PATTERN_HEAD: + fprintf(stderr, "<head %d>", p->field); break; + case GREP_PATTERN_BODY: + fprintf(stderr, "<body>"); break; + } + switch (p->token) { + default: break; + case GREP_PATTERN_HEAD: + case GREP_PATTERN_BODY: + case GREP_PATTERN: + fprintf(stderr, "%.*s", (int)p->patternlen, p->pattern); + break; + } + fputc('\n', stderr); +} + +static void dump_grep_expression_1(struct grep_expr *x, int in) +{ + indent(in); + switch (x->node) { + case GREP_NODE_TRUE: + fprintf(stderr, "true\n"); + break; + case GREP_NODE_ATOM: + dump_grep_pat(x->u.atom); + break; + case GREP_NODE_NOT: + fprintf(stderr, "(not\n"); + dump_grep_expression_1(x->u.unary, in+1); + indent(in); + fprintf(stderr, ")\n"); + break; + case GREP_NODE_AND: + fprintf(stderr, "(and\n"); + dump_grep_expression_1(x->u.binary.left, in+1); + dump_grep_expression_1(x->u.binary.right, in+1); + indent(in); + fprintf(stderr, ")\n"); + break; + case GREP_NODE_OR: + fprintf(stderr, "(or\n"); + dump_grep_expression_1(x->u.binary.left, in+1); + dump_grep_expression_1(x->u.binary.right, in+1); + indent(in); + fprintf(stderr, ")\n"); + break; + } +} + +static void dump_grep_expression(struct grep_opt *opt) +{ + struct grep_expr *x = opt->pattern_expression; + + if (opt->all_match) + fprintf(stderr, "[all-match]\n"); + dump_grep_expression_1(x, 0); + fflush(NULL); +} + static struct grep_expr *grep_true_expr(void) { struct grep_expr *z = xcalloc(1, sizeof(*z)); @@ -395,7 +480,23 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt) return header_expr; } -void compile_grep_patterns(struct grep_opt *opt) +static struct grep_expr *grep_splice_or(struct grep_expr *x, struct grep_expr *y) +{ + struct grep_expr *z = x; + + while (x) { + assert(x->node == GREP_NODE_OR); + if (x->u.binary.right && + x->u.binary.right->node == GREP_NODE_TRUE) { + x->u.binary.right = y; + break; + } + x = x->u.binary.right; + } + return z; +} + +static void compile_grep_patterns_real(struct grep_opt *opt) { struct grep_pat *p; struct grep_expr *header_expr = prep_header_patterns(opt); @@ -415,7 +516,7 @@ void compile_grep_patterns(struct grep_opt *opt) if (opt->all_match || header_expr) opt->extended = 1; - else if (!opt->extended) + else if (!opt->extended && !opt->debug) return; p = opt->pattern_list; @@ -429,12 +530,22 @@ void compile_grep_patterns(struct grep_opt *opt) if (!opt->pattern_expression) opt->pattern_expression = header_expr; + else if (opt->all_match) + opt->pattern_expression = grep_splice_or(header_expr, + opt->pattern_expression); else opt->pattern_expression = grep_or_expr(opt->pattern_expression, header_expr); opt->all_match = 1; } +void compile_grep_patterns(struct grep_opt *opt) +{ + compile_grep_patterns_real(opt); + if (opt->debug) + dump_grep_expression(opt); +} + static void free_pattern_expr(struct grep_expr *x) { switch (x->node) { @@ -1358,7 +1469,7 @@ static int grep_source_load_file(struct grep_source *gs) return 0; } -int grep_source_load(struct grep_source *gs) +static int grep_source_load(struct grep_source *gs) { if (gs->buf) return 0; @@ -1386,7 +1497,7 @@ void grep_source_load_driver(struct grep_source *gs) grep_attr_unlock(); } -int grep_source_is_binary(struct grep_source *gs) +static int grep_source_is_binary(struct grep_source *gs) { grep_source_load_driver(gs); if (gs->driver->binary != -1) @@ -98,6 +98,7 @@ struct grep_opt { int word_regexp; int fixed; int all_match; + int debug; #define GREP_BINARY_DEFAULT 0 #define GREP_BINARY_NOMATCH 1 #define GREP_BINARY_TEXT 2 @@ -158,11 +159,10 @@ struct grep_source { void grep_source_init(struct grep_source *gs, enum grep_source_type type, const char *name, const void *identifier); -int grep_source_load(struct grep_source *gs); void grep_source_clear_data(struct grep_source *gs); void grep_source_clear(struct grep_source *gs); void grep_source_load_driver(struct grep_source *gs); -int grep_source_is_binary(struct grep_source *gs); + int grep_source(struct grep_opt *opt, struct grep_source *gs); diff --git a/http-push.c b/http-push.c index a832ca77a3..8701c1215d 100644 --- a/http-push.c +++ b/http-push.c @@ -1610,9 +1610,8 @@ static int verify_merge_base(unsigned char *head_sha1, struct ref *remote) { struct commit *head = lookup_commit_or_die(head_sha1, "HEAD"); struct commit *branch = lookup_commit_or_die(remote->old_sha1, remote->name); - struct commit_list *merge_bases = get_merge_bases(head, branch, 1); - return (merge_bases && !merge_bases->next && merge_bases->item == branch); + return in_merge_bases(branch, head); } static int delete_remote_branch(const char *pattern, int force) @@ -93,7 +93,7 @@ static void copy_email(const struct passwd *pw, struct strbuf *email) add_domainname(email); } -const char *ident_default_name(void) +static const char *ident_default_name(void) { if (!git_default_name.len) { copy_gecos(xgetpwuid_self(), &git_default_name); @@ -117,7 +117,7 @@ const char *ident_default_email(void) return git_default_email.buf; } -const char *ident_default_date(void) +static const char *ident_default_date(void) { if (!git_default_date[0]) datestamp(git_default_date, sizeof(git_default_date)); @@ -210,8 +210,10 @@ int split_ident_line(struct ident_split *split, const char *line, int len) split->name_end = cp + 1; break; } - if (!split->name_end) - return status; + if (!split->name_end) { + /* no human readable name */ + split->name_end = split->name_begin; + } for (cp = split->mail_begin; cp < line + len; cp++) if (*cp == '>') { diff --git a/ll-merge.c b/ll-merge.c index f3f7692158..acea33bf1b 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -35,7 +35,7 @@ struct ll_merge_driver { */ static int ll_binary_merge(const struct ll_merge_driver *drv_unused, mmbuffer_t *result, - const char *path_unused, + const char *path, mmfile_t *orig, const char *orig_name, mmfile_t *src1, const char *name1, mmfile_t *src2, const char *name2, @@ -46,16 +46,34 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused, assert(opts); /* - * The tentative merge result is "ours" for the final round, - * or common ancestor for an internal merge. Still return - * "conflicted merge" status. + * The tentative merge result is the or common ancestor for an internal merge. */ - stolen = opts->virtual_ancestor ? orig : src1; + if (opts->virtual_ancestor) { + stolen = orig; + } else { + switch (opts->variant) { + default: + warning("Cannot merge binary files: %s (%s vs. %s)", + path, name1, name2); + /* fallthru */ + case XDL_MERGE_FAVOR_OURS: + stolen = src1; + break; + case XDL_MERGE_FAVOR_THEIRS: + stolen = src2; + break; + } + } result->ptr = stolen->ptr; result->size = stolen->size; stolen->ptr = NULL; - return 1; + + /* + * With -Xtheirs or -Xours, we have cleanly merged; + * otherwise we got a conflict. + */ + return (opts->variant ? 0 : 1); } static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, @@ -73,8 +91,6 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, if (buffer_is_binary(orig->ptr, orig->size) || buffer_is_binary(src1->ptr, src1->size) || buffer_is_binary(src2->ptr, src2->size)) { - warning("Cannot merge binary files: %s (%s vs. %s)", - path, name1, name2); return ll_binary_merge(drv_unused, result, path, orig, orig_name, diff --git a/merge-recursive.c b/merge-recursive.c index 7866ca1026..d8820604ca 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -844,14 +844,14 @@ static int merge_3way(struct merge_options *o, if (strcmp(a->path, b->path) || (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) { base_name = o->ancestor == NULL ? NULL : - xstrdup(mkpath("%s:%s", o->ancestor, one->path)); - name1 = xstrdup(mkpath("%s:%s", branch1, a->path)); - name2 = xstrdup(mkpath("%s:%s", branch2, b->path)); + mkpathdup("%s:%s", o->ancestor, one->path); + name1 = mkpathdup("%s:%s", branch1, a->path); + name2 = mkpathdup("%s:%s", branch2, b->path); } else { base_name = o->ancestor == NULL ? NULL : - xstrdup(mkpath("%s", o->ancestor)); - name1 = xstrdup(mkpath("%s", branch1)); - name2 = xstrdup(mkpath("%s", branch2)); + mkpathdup("%s", o->ancestor); + name1 = mkpathdup("%s", branch1); + name2 = mkpathdup("%s", branch2); } read_mmblob(&orig, one->sha1); @@ -861,6 +861,7 @@ static int merge_3way(struct merge_options *o, merge_status = ll_merge(result_buf, a->path, &orig, base_name, &src1, name1, &src2, name2, &ll_opts); + free(base_name); free(name1); free(name2); free(orig.ptr); @@ -1196,8 +1196,18 @@ void free_notes(struct notes_tree *t) memset(t, 0, sizeof(struct notes_tree)); } -void format_note(struct notes_tree *t, const unsigned char *object_sha1, - struct strbuf *sb, const char *output_encoding, int flags) +/* + * Fill the given strbuf with the notes associated with the given object. + * + * If the given notes_tree structure is not initialized, it will be auto- + * initialized to the default value (see documentation for init_notes() above). + * If the given notes_tree is NULL, the internal/default notes_tree will be + * used instead. + * + * 'flags' is a bitwise combination of the flags for format_display_notes. + */ +static void format_note(struct notes_tree *t, const unsigned char *object_sha1, + struct strbuf *sb, const char *output_encoding, int flags) { static const char utf8[] = "utf-8"; const unsigned char *sha1; @@ -241,20 +241,6 @@ void free_notes(struct notes_tree *t); #define NOTES_SHOW_HEADER 1 #define NOTES_INDENT 2 -/* - * Fill the given strbuf with the notes associated with the given object. - * - * If the given notes_tree structure is not initialized, it will be auto- - * initialized to the default value (see documentation for init_notes() above). - * If the given notes_tree is NULL, the internal/default notes_tree will be - * used instead. - * - * 'flags' is a bitwise combination of the above formatting flags. - */ -void format_note(struct notes_tree *t, const unsigned char *object_sha1, - struct strbuf *sb, const char *output_encoding, int flags); - - struct string_list; struct display_notes_opt { @@ -48,7 +48,7 @@ char *mksnpath(char *buf, size_t n, const char *fmt, ...) return cleanup_path(buf); } -static char *git_vsnpath(char *buf, size_t n, const char *fmt, va_list args) +static char *vsnpath(char *buf, size_t n, const char *fmt, va_list args) { const char *git_dir = get_git_dir(); size_t len; @@ -70,21 +70,22 @@ bad: char *git_snpath(char *buf, size_t n, const char *fmt, ...) { + char *ret; va_list args; va_start(args, fmt); - (void)git_vsnpath(buf, n, fmt, args); + ret = vsnpath(buf, n, fmt, args); va_end(args); - return buf; + return ret; } char *git_pathdup(const char *fmt, ...) { - char path[PATH_MAX]; + char path[PATH_MAX], *ret; va_list args; va_start(args, fmt); - (void)git_vsnpath(path, sizeof(path), fmt, args); + ret = vsnpath(path, sizeof(path), fmt, args); va_end(args); - return xstrdup(path); + return xstrdup(ret); } char *mkpathdup(const char *fmt, ...) @@ -118,23 +119,14 @@ char *mkpath(const char *fmt, ...) char *git_path(const char *fmt, ...) { - const char *git_dir = get_git_dir(); char *pathname = get_pathname(); va_list args; - unsigned len; + char *ret; - len = strlen(git_dir); - if (len > PATH_MAX-100) - return bad_path; - memcpy(pathname, git_dir, len); - if (len && git_dir[len-1] != '/') - pathname[len++] = '/'; va_start(args, fmt); - len += vsnprintf(pathname + len, PATH_MAX - len, fmt, args); + ret = vsnpath(pathname, PATH_MAX, fmt, args); va_end(args); - if (len >= PATH_MAX) - return bad_path; - return cleanup_path(pathname); + return ret; } void home_config_paths(char **global, char **xdg, char *file) @@ -33,8 +33,9 @@ Repository: https://github.com/nafmo/git-l10n-sv/ Leader: Peter Krefting <peter@softwolves.pp.se> Language: vi (Vietnamese) -Repository: https://github.com/vnwildman/git.git +Repository: https://github.com/vnwildman/git/ Leader: Trần Ngá»c Quân <vnwildman AT gmail.com> +Members: Nguyá»…n Thái Ngá»c Duy <pclouds AT gmail.com> Language: zh_CN (Simplified Chinese) Repository: https://github.com/gotgit/git-po-zh_CN/ @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: git 1.7.12\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-08-06 23:47+0800\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" "PO-Revision-Date: 2012-03-28 18:46+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n" "Language-Team: German\n" @@ -58,7 +58,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Dem Projektarchiv fehlen folgende vorrausgesetzte Versionen:" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -85,7 +85,7 @@ msgstr[1] "Das Paket benötigt diese %d Referenzen" msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -231,32 +231,32 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" msgstr " 0 Dateien geändert" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d Datei geändert" msgstr[1] " %d Dateien geändert" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ", %d Zeile hinzugefügt(+)" msgstr[1] ", %d Zeilen hinzugefügt(+)" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] ", %d Zeile entfernt(-)" msgstr[1] ", %d Zeilen entfernt(-)" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -361,74 +361,66 @@ msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen" msgid "error building trees" msgstr "Fehler beim Erstellen der Bäume" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "diff_setup_done fehlgeschlagen" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "merge-recursive: Festplatte voll?" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "Fehler beim Erstellen des Pfades '%s'%s" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Entferne %s um Platz für Unterverzeichnis zu schaffen\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "verweigere, da unbeobachtete Dateien in '%s' verloren gehen würden" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "kann Objekt %s '%s' nicht lesen" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "Blob erwartet für %s '%s'" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "Fehler beim Öffnen von '%s'" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s'" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "weiß nicht was mit %06o %s '%s' zu machen ist" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "Fehler bei Ausführung der internen Zusammenführung" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "Konnte %s nicht zur Datenbank hinzufügen" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "nicht unterstützter Objekttyp im Baum" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -437,7 +429,7 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich gelassen." -#: merge-recursive.c:1044 merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -446,20 +438,20 @@ msgstr "" "KONFLIKT (%s/löschen): %s gelöscht in %s und %s in %s. Stand %s von %s wurde " "im Arbeitsbereich bei %s gelassen." -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "umbenennen" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "umbenannt" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s ist ein Verzeichnis in %s, füge es stattdessen als %s hinzu" -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -468,148 +460,148 @@ msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Zweig \"%s\" " "und \"%s\"->\"%s\" in Zweig \"%s\"%s" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr " (bleibt unaufgelöst)" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (umbenennen/umbenennen): Benenne um %s->%s in %s. Benenne um %s->%s " "in %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Benenne stattdessen %s nach %s und %s nach %s um" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" "KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in " "%s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "Füge zusammengeführte Datei %s hinzu" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "Füge stattdessen als %s hinzu" -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "kann Objekt %s nicht lesen" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "Objekt %s ist kein Blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "ändern" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" msgstr "geändert" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "Inhalt" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "hinzufügen/hinzufügen" -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "automatische Zusammenführung von %s" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "Unterprojekt" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Zusammenführungskonflikt in %s" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "Entferne %s" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "Datei/Verzeichnis" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "Verzeichnis/Datei" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Es existiert bereits ein Verzeichnis %s in %s. Füge %s als %s " "hinzu." -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" msgstr "Füge %s hinzu" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "Fataler Fehler bei der Zusammenführung. Sollte nicht passieren." -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "Bereits aktuell!" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "Zusammenführen der Bäume %s und %s fehlgeschlagen" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "unverarbeiteter Pfad??? %s" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "Zusammenführung:" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "%u gemeinsamen Vorfahren gefunden" msgstr[1] "%u gemeinsame Vorfahren gefunden" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "Zusammenführung hat keine Version zurückgegeben" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "Konnte Objekt '%s' nicht parsen." -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "Konnte Bereitstellung nicht schreiben." @@ -667,14 +659,14 @@ msgstr[1] "" "Dein Zweig und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Versionen.\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." @@ -880,7 +872,7 @@ msgstr "kann Zweigspitze (HEAD) nicht auflösen" msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" -#: sequencer.c:805 builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" @@ -1293,6 +1285,11 @@ msgstr "voraus " 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" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1397,7 +1394,7 @@ msgstr "Wolltest du vielleicht 'git add .' sagen?\n" msgid "index file corrupt" msgstr "Bereitstellungsdatei beschädigt" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." @@ -1415,56 +1412,56 @@ msgstr "nicht erkannte Option für Leerzeichen: '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "nicht erkannte Option zum Ignorieren von Leerzeichen: '%s'" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" "git apply: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile " "%d" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1476 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1479,70 +1476,70 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1703 +#: builtin/apply.c:1702 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1706 +#: builtin/apply.c:1705 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1852 +#: builtin/apply.c:1851 #, 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:1881 +#: builtin/apply.c:1880 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "Ups" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1550,12 +1547,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:2784 +#: builtin/apply.c:2783 #, 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:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" @@ -1564,339 +1561,339 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:2912 +#: builtin/apply.c:2911 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, 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:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht bereitgestellt" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Bereitstellung" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3526 +#: builtin/apply.c:3525 #, 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:3531 +#: builtin/apply.c:3530 #, 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:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s..." -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Bereitstellung entfernen" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "fehlerhafter Patch für Unterprojekt %s" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3787 +#: builtin/apply.c:3786 #, 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:3790 builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, 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:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:3959 +#: builtin/apply.c:3958 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "interner Fehler" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, 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:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Bereich #%d zurückgewiesen." -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 msgid "unable to read index file" msgstr "Konnte Bereitstellungsdatei nicht lesen" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 msgid "don't apply changes matching the given path" msgstr "wendet keine Änderungen im angegebenen Pfad an" -#: builtin/apply.c:4288 +#: builtin/apply.c:4287 msgid "apply changes matching the given path" msgstr "wendet Änderungen nur im angegebenen Pfad an" -#: builtin/apply.c:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "entfernt <Anzahl> vorrangestellte Schrägstriche von herkömmlichen " "Differenzpfaden" -#: builtin/apply.c:4294 +#: builtin/apply.c:4293 msgid "ignore additions made by the patch" msgstr "ignoriert hinzugefügte Zeilen des Patches" -#: builtin/apply.c:4296 +#: builtin/apply.c:4295 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:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" msgstr "" "zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" -#: builtin/apply.c:4302 +#: builtin/apply.c:4301 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:4304 +#: builtin/apply.c:4303 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:4306 +#: builtin/apply.c:4305 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:4308 +#: builtin/apply.c:4307 msgid "apply a patch without touching the working tree" msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 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:4314 +#: builtin/apply.c:4313 msgid "build a temporary index based on embedded index information" msgstr "" "erstellt eine temporäre Bereitstellung basierend auf den integrierten " "Bereitstellungsinformationen" -#: builtin/apply.c:4316 +#: builtin/apply.c:4315 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4319 +#: builtin/apply.c:4318 msgid "ensure at least <n> lines of context match" msgstr "" "stellt sicher, dass mindestens <Anzahl> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 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:4324 builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 msgid "ignore changes in whitespace when finding context" msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" -#: builtin/apply.c:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "wendet den Patch in umgekehrter Reihenfolge an" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 msgid "don't expect at least one line of context" msgstr "erwartet keinen Kontext" -#: builtin/apply.c:4334 +#: builtin/apply.c:4333 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " "Dateien" -#: builtin/apply.c:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "erlaubt sich überlappende Patch-Bereiche" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" -#: builtin/apply.c:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 msgid "prepend <root> to all filenames" msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" -#: builtin/apply.c:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "--3way außerhalb eines Projektarchivs" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "--index außerhalb eines Projektarchivs" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "--cached außerhalb eines Projektarchivs" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, 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:4414 builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2163,7 +2160,7 @@ msgstr "Pfad '%s': kann nicht zusammenführen" msgid "Unable to add merge result for '%s'" msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "beschädigte Bereitstellungsdatei" @@ -2172,60 +2169,56 @@ msgstr "beschädigte Bereitstellungsdatei" msgid "path '%s' is unmerged" msgstr "Pfad '%s' ist nicht zusammengeführt." -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done fehlgeschlagen" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "Du musst zuerst deine aktuelle Bereitstellung auflösen." -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Konnte \"reflog\" für '%s' nicht durchführen\n" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "Zweigspitze (HEAD) ist jetzt bei" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "Setze Zweig '%s' zurück\n" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "Bereits auf '%s'\n" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Gewechselt zu einem neuen Zweig '%s'\n" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "Gewechselt zu Zweig '%s'\n" -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr " ... und %d weitere.\n" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2248,7 +2241,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2263,71 +2256,71 @@ msgstr "" " git branch neuer_zweig_name %s\n" "\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "Vorherige Position der Zweigspitze (HEAD) war" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "du bist auf einem Zweig, der noch geboren wird" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein Baum: %s" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" msgstr "-B kann nicht mit -b benutzt werden" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "--patch ist inkompatibel mit allen anderen Optionen" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "--detach kann nicht mit -t benutzt werden" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "--track benötigt einen Zweignamen" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "Vermisse Zweignamen; versuche -b" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan und -b|-B sind gegenseitig exklusiv" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "--orphan kann nicht mit -t benutzt werden" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f und -m sind inkompatibel" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -2338,17 +2331,17 @@ msgstr "" "Hast du beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " "werden kann?" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" "git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " "von Zweigen." -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach nimmt kein Pfad-Argument" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2356,11 +2349,11 @@ msgstr "" "git checkout: --ours/--theirs, --force and --merge sind inkompatibel wenn\n" "du aus der Bereitstellung auscheckst." -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "Kann Zweig nur zu einer Version wechseln." -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs ist inkompatibel mit den Wechseln von Zweigen." @@ -2418,7 +2411,7 @@ msgstr "Referenziertes Projektarchiv '%s' ist kein lokales Verzeichnis." msgid "failed to create directory '%s'" msgstr "Fehler beim Erstellen von Verzeichnis '%s'" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "Konnte '%s' nicht lesen" @@ -2433,11 +2426,6 @@ msgstr "%s existiert und ist kein Verzeichnis" msgid "failed to stat %s\n" msgstr "Konnte %s nicht lesen\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2843,7 +2831,7 @@ msgstr " (Basis-Version)" msgid "could not parse HEAD commit" msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." @@ -2872,7 +2860,7 @@ msgstr "Eintragung abgebrochen; du hast die Beschreibung nicht editiert.\n" msgid "Aborting commit due to empty commit message.\n" msgstr "Eintragung aufgrund leerer Versionsbeschreibung abgebrochen.\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Versionsobjektes." @@ -2979,36 +2967,36 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." msgid "--dirty is incompatible with committishes" msgstr "--dirty ist inkompatibel mit Versionen" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': keine reguläre Datei oder symbolischer Link" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "Ungültige Option: %s" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "Kein Git-Projektarchiv" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "Objekt '%s' ist ungültig." -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "Mehr als %d Zweige angegeben: '%s'" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "Mehr als zwei Blobs angegeben: '%s'" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "unbehandeltes Objekt '%s' angegeben" @@ -3212,58 +3200,58 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "grep: Fehler beim Erzeugen eines Thread: %s" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "Fehler beim Verzeichniswechsel: %s" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "konnte Zweig (%s) nicht lesen" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "Schalter '%c' erwartet einen numerischen Wert" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "keine Muster angegeben" -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "ungültiges Objekt %s" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager arbeitet nur innerhalb des Arbeitsbaums" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached oder --untracked kann nicht mit --no-index benutzt werden" -#: builtin/grep.c:968 +#: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index oder --untracked kann nicht mit Versionen benutzt werden" -#: builtin/grep.c:971 +#: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" -#: builtin/grep.c:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "sowohl --cached als auch Zweige gegeben" @@ -3758,58 +3746,58 @@ msgstr "Brauche genau einen Versionsbereich." msgid "Not a range." msgstr "Kein Versionsbereich." -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "unechte Einreicher-Informationen %s" -#: builtin/log.c:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "-n und -k schliessen sich gegenseitig aus" -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix und -k schliessen sich gegenseitig aus" -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "--name-only macht keinen Sinn" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "--name-status macht keinen Sinn" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "--check macht keinen Sinn" -#: builtin/log.c:1242 +#: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1397 +#: builtin/log.c:1394 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1501 +#: builtin/log.c:1498 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -3817,7 +3805,7 @@ msgstr "" "Konnte gefolgten, externen Zweig nicht finden, bitte gebe <upstream> manuell " "an.\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "Unbekannte Version %s" @@ -3882,51 +3870,51 @@ msgstr "" "Keine Zusammenführungsbeschreibung -- Zweigspitze (HEAD) wird nicht " "aktualisiert\n" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' zeigt auf keine Version" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Ungültiger branch.%s.mergeoptions String: %s" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "\"git write-tree\" schlug beim Schreiben eines Baumes fehl" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "Lesen des Zwischenspeichers fehlgeschlagen" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "Es wird nur die Zusammenführung von zwei Zweigen behandelt." -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Unbekannte Option für merge-recursive: -X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "konnte %s nicht schreiben" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "konnte nicht von '%s' lesen" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Zusammenführung wurde nicht eingetragen; benutze 'git commit' um die " "Zusammenführung abzuschließen.\n" -#: builtin/merge.c:892 +#: builtin/merge.c:891 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" @@ -3942,56 +3930,56 @@ msgstr "" "Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung " "bricht die Eintragung ab.\n" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "Leere Versionsbeschreibung" -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "Wunderbar.\n" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Automatische Zusammenführung fehlgeschlagen; behebe die Konflikte und trage " "dann das Ergebnis ein.\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ist keine Version" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "Du befindest dich auf keinem Zweig." -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "Kein externes Archiv für den aktuellen Zweig." -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "" "Es ist kein externes Standard-Projektarchiv für den aktuellen Zweig " "definiert." -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Kein externer Ãœbernahmezweig für %s von %s" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "%s - nichts was wir zusammenführen können" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Es gibt keine Zusammenführung zum Abbrechen (vermisse MERGE_HEAD)" -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3999,12 +3987,12 @@ msgstr "" "Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert).\n" "Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" "Du hast deine Zusammenführung nicht abgeschlossen (MERGE_HEAD existiert)." -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -4012,80 +4000,80 @@ msgstr "" "Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert).\n" "Bitte trage deine Änderungen ein, bevor du zusammenführen kannst." -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" "Du hast \"cherry-pick\" nicht abgeschlossen (CHERRY_PICK_HEAD existiert)." -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "Du kannst --squash nicht mit --no-ff kombinieren." -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kannst --no-ff nicht mit --ff--only kombinieren." -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Keine Version angegeben und merge.defaultToUpstream ist nicht gesetzt." -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "Kann nur exakt eine Version in einem leeren Zweig zusammenführen." -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen." -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "nicht vorzuspulende Version macht in einem leeren Zweig keinen Sinn" -#: builtin/merge.c:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich triviale \"in-index\"-Zusammenführung...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Zweiges bis zum Ursprung...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Zusammenführungsstrategie %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Zusammenführungsstrategie behandelt diese Zusammenführung.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Zusammenführung mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutze \"%s\" um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -4426,14 +4414,49 @@ msgstr "" "aktuellen Zweiges '%s' ist, ohne mir mitzuteilen, was ich versenden\n" "soll, um welchen externen Zweig zu aktualisieren." -#: builtin/push.c:174 +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" +"'push.default' ist nicht gesetzt; der implizit gesetzte Wert\n" +"wird in Git 2.0 von 'matching' nach 'simple' geändert. Um diese Meldung zu\n" +"unterdrücken und das aktuelle Verhalten nach Änderung des Standardwertes\n" +"beizubehalten, benutze:" +"\n" +" git config --global push.default matching\n" +"\n" +"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen,\n" +"benutze:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Führe 'git help config' aus und suche 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 du gelegentlich ältere Versionen von" +" Git benutzt.)" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du hast keine Referenzspezifikationen zum Versenden angegeben, und push." "default ist \"nothing\"." -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4446,22 +4469,22 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"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 du nicht\n" "beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu " "versendenden\n" "Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu " -"'current'\n" +"'simple', 'current'\n" "oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden." -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4475,22 +4498,22 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Projektarchiv '%s'" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4512,31 +4535,31 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all und --tags sind inkompatibel" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all kann nicht mit Referenzspezifikationen kombiniert werden" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror und --tags sind inkompatibel" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all und --mirror sind inkompatibel" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" @@ -5952,34 +5975,34 @@ msgstr "(Zur Wiederherstellung gebe \"git stash apply\" ein)" msgid "cannot strip one component off url '$remoteurl'" msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, 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:189 +#: git-submodule.sh:211 #, 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:201 +#: git-submodule.sh:223 #, 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:290 +#: git-submodule.sh:312 #, 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:307 +#: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existiert bereits in der Bereitstellung" -#: git-submodule.sh:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5990,65 +6013,65 @@ msgstr "" "$sm_path\n" "Benutze -f wenn du diesen wirklich hinzufügen möchtest." -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, 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:324 +#: git-submodule.sh:346 #, 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:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:348 +#: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Betrete '$prefix$sm_path'" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, 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:447 +#: git-submodule.sh:471 #, 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:456 +#: git-submodule.sh:480 #, 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:458 +#: git-submodule.sh:482 #, 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:466 +#: git-submodule.sh:490 #, 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:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -6057,95 +6080,104 @@ msgstr "" "Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" "Vielleicht möchtest du 'update --init' benutzen?" -#: git-submodule.sh:578 +#: git-submodule.sh:603 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" -#: git-submodule.sh:597 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern" -#: git-submodule.sh:611 +#: git-submodule.sh:636 #, 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:612 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" -#: git-submodule.sh:617 +#: git-submodule.sh:642 #, 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:618 +#: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'" -#: git-submodule.sh:623 +#: git-submodule.sh:648 #, 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:624 +#: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" -#: git-submodule.sh:754 +#: git-submodule.sh:779 msgid "The --cached option cannot be used with the --files option" msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden" #. unexpected type -#: git-submodule.sh:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Warnung: $name beinhaltet nicht Version $sha1_src" -#: git-submodule.sh:815 +#: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" -#: git-submodule.sh:818 +#: git-submodule.sh:843 #, 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:843 +#: git-submodule.sh:868 msgid "blob" msgstr "Blob" -#: git-submodule.sh:881 +#: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" -#: git-submodule.sh:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "# Änderungen in Unterprojekt zum Eintragen:" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synchronisiere Unterprojekt-URL für '$name'" +#~ msgid "diff setup failed" +#~ msgstr "diff_setup_done fehlgeschlagen" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: Festplatte voll?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done fehlgeschlagen" + #~ msgid "-d option is no longer supported. Do not use." #~ msgstr "-d Option wird nicht länger unterstützt. Nicht benutzen." diff --git a/po/git.pot b/po/git.pot index 5c586d6007..6915b02153 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-08-06 23:47+0800\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -55,7 +55,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" @@ -82,7 +82,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -225,32 +225,32 @@ msgid "" "%s" msgstr "" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" msgstr "" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] "" msgstr[1] "" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "" msgstr[1] "" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -345,243 +345,235 @@ msgstr "" msgid "error building trees" msgstr "" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr "" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree." msgstr "" -#: merge-recursive.c:1044 merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " "in tree at %s." msgstr "" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "" -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" "\"->\"%s\" in \"%s\"%s" msgstr "" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr "" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "" -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" msgstr "" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "" -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" msgstr "" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "" -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "" msgstr[1] "" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "" -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "" @@ -632,14 +624,14 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "" @@ -836,7 +828,7 @@ msgstr "" msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:805 builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "" @@ -1226,6 +1218,11 @@ msgstr "" msgid ", behind " msgstr "" +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1326,7 +1323,7 @@ msgstr "" msgid "index file corrupt" msgstr "" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" @@ -1344,52 +1341,52 @@ msgstr "" msgid "unrecognized whitespace ignore option '%s'" msgstr "" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1477 +#: builtin/apply.c:1476 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1400,403 +1397,403 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1703 +#: builtin/apply.c:1702 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1706 +#: builtin/apply.c:1705 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1852 +#: builtin/apply.c:1851 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1881 +#: builtin/apply.c:1880 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, 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:2784 +#: builtin/apply.c:2783 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2912 +#: builtin/apply.c:2911 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3526 +#: builtin/apply.c:3525 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3531 +#: builtin/apply.c:3530 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3787 +#: builtin/apply.c:3786 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3790 builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3959 +#: builtin/apply.c:3958 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4288 +#: builtin/apply.c:4287 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4294 +#: builtin/apply.c:4293 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4296 +#: builtin/apply.c:4295 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4302 +#: builtin/apply.c:4301 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4304 +#: builtin/apply.c:4303 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4306 +#: builtin/apply.c:4305 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4308 +#: builtin/apply.c:4307 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4314 +#: builtin/apply.c:4313 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4316 +#: builtin/apply.c:4315 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4318 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4324 builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4334 +#: builtin/apply.c:4333 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4414 builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2050,7 +2047,7 @@ msgstr "" msgid "Unable to add merge result for '%s'" msgstr "" -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "" @@ -2059,60 +2056,56 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "" -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "" -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "" -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr "" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2127,7 +2120,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2137,96 +2130,96 @@ msgid "" "\n" msgstr "" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" msgstr "" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" msgstr "" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "" @@ -2280,7 +2273,7 @@ msgstr "" msgid "failed to create directory '%s'" msgstr "" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "" @@ -2295,11 +2288,6 @@ msgstr "" msgid "failed to stat %s\n" msgstr "" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2654,7 +2642,7 @@ msgstr "" msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -2683,7 +2671,7 @@ msgstr "" msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "" @@ -2780,36 +2768,36 @@ msgstr "" msgid "--dirty is incompatible with committishes" msgstr "" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -2997,57 +2985,57 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "" -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:968 +#: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:971 +#: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "" @@ -3535,64 +3523,64 @@ msgstr "" msgid "Not a range." msgstr "" -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1242 +#: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1397 +#: builtin/log.c:1394 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1501 +#: builtin/log.c:1498 #, 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:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "" @@ -3655,49 +3643,49 @@ msgstr "" msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:892 +#: builtin/merge.c:891 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" @@ -3706,140 +3694,140 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "" -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -4144,12 +4132,30 @@ msgid "" "to update which remote branch." msgstr "" -#: builtin/push.c:174 +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4157,15 +4163,15 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4173,22 +4179,22 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4201,31 +4207,31 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -5511,32 +5517,32 @@ msgstr "" msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:189 +#: git-submodule.sh:211 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:201 +#: git-submodule.sh:223 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:290 +#: git-submodule.sh:312 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:307 +#: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5544,151 +5550,151 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:324 +#: git-submodule.sh:346 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:348 +#: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:447 +#: git-submodule.sh:471 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:458 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:466 +#: git-submodule.sh:490 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:578 +#: git-submodule.sh:603 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:597 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:611 +#: git-submodule.sh:636 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:612 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:617 +#: git-submodule.sh:642 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:618 +#: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:623 +#: git-submodule.sh:648 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:624 +#: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:754 +#: git-submodule.sh:779 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:815 +#: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:818 +#: git-submodule.sh:843 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:843 +#: git-submodule.sh:868 msgid "blob" msgstr "" -#: git-submodule.sh:881 +#: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 1.7.12\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-08-06 23:47+0800\n" -"PO-Revision-Date: 2012-08-14 09:58+0100\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"PO-Revision-Date: 2012-09-07 10:09+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -58,7 +58,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -85,7 +85,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -230,32 +230,32 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" msgstr " 0 filer ändrade" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d fil ändrad" msgstr[1] " %d filer ändrade" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ", %d tillägg(+)" msgstr[1] ", %d tillägg(+)" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] ", %d borttagning(-)" msgstr[1] ", %d borttagningar(-)" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -360,74 +360,66 @@ msgstr "addinfo_cache misslyckades för sökvägen \"%s\"" msgid "error building trees" msgstr "fel vid byggande av träd" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "misslyckades sätta upp för diff" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "merge-recursive: disk full?" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "misslyckades skapa sökvägen \"%s\"%s" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Tar bort %s för att göra plats för underkatalog\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ": kanske en K/F-konflikt?" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "vägrar förlora ospÃ¥rad fil vid \"%s\"" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "kan inte läsa objektet %s: \"%s\"" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "blob förväntades för %s \"%s\"" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "misslyckades ta skapa symboliska länken \"%s\"" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "vet inte hur %06o %s \"%s\" skall hanteras" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "Misslyckades exekvera intern sammanslagning" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "Kunde inte lägga till %s till databasen" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "objekttyp som ej stöds upptäcktes i trädet" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -436,7 +428,7 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet." -#: merge-recursive.c:1044 merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -445,20 +437,20 @@ msgstr "" "KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad " "i trädet vid %s." -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "namnbyte" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "namnbytt" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s är en katalog i %s lägger till som %s istället" -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -467,144 +459,144 @@ msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" pÃ¥ grenen \"%s\" " "namnbyte \"%s\"->\"%s\" i \"%s\"%s" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr " (lämnad olöst)" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Byter namn pÃ¥ %s till %s och %s till %s istället" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "Lägger till sammanslagen %s" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "Lägger till som %s iställer" -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "kan inte läsa objektet %s" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "objektet %s är inte en blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "ändra" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" msgstr "ändrad" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "innehÃ¥ll" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "tillägg/tillägg" -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Hoppade över %s (sammanslagen samma som befintlig)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "SlÃ¥r ihop %s automatiskt" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "undermodul" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "Tar bort %s" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "fil/katalog" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "katalog/fil" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s" -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" msgstr "Lägger till %s" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa." -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "Redan à jour!" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "sammanslagning av träden %s och %s misslyckades" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "Obehandlad sökväg??? %s" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "SlÃ¥r ihop:" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "hittade %u gemensam förfader:" msgstr[1] "hittade %u gemensamma förfäder:" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "sammanslagningen returnerade ingen incheckning" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "Kunde inte tolka objektet \"%s\"" -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." @@ -661,14 +653,14 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" @@ -870,7 +862,7 @@ msgstr "kan inte bestämma HEAD" 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:805 builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" @@ -1270,6 +1262,11 @@ msgstr "före " msgid ", behind " msgstr ", efter " +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1370,7 +1367,7 @@ msgstr "Kanske menade du att skriva \"git add .\"?\n" msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1388,52 +1385,52 @@ msgstr "okänt alternativ för whitespace: \"%s\"" msgid "unrecognized whitespace ignore option '%s'" msgstr "okänt alternativ för ignore-whitespace: \"%s\"" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec returnerade %d för indata: %s" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "kan inte hitta filnamn i patchen pÃ¥ rad %d" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: dÃ¥lig git-diff - förväntade /dev/null, fick %s pÃ¥ rad %d" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: dÃ¥lig git-diff - motsägande nytt filnamn pÃ¥ rad %d" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: dÃ¥lig git-diff - motsägande gammalt filnamn pÃ¥ rad %d" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dÃ¥lig git-diff - förväntade /dev/null pÃ¥ rad %d" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud pÃ¥ rad %d: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1476 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1449,82 +1446,82 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 msgid "new file depends on old contents" msgstr "ny fil beror pÃ¥ gammalt innehÃ¥ll" -#: builtin/apply.c:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehÃ¥ll" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch pÃ¥ rad %d" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror pÃ¥ gammalt innehÃ¥ll" -#: builtin/apply.c:1703 +#: builtin/apply.c:1702 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehÃ¥ll" -#: builtin/apply.c:1706 +#: builtin/apply.c:1705 #, 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:1852 +#: builtin/apply.c:1851 #, 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:1881 +#: builtin/apply.c:1880 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen pÃ¥ rad %d känns inte igen" -#: builtin/apply.c:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp pÃ¥ rad %d" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "hoppsan" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning pÃ¥ rad: \"%c\"" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, 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:2784 +#: builtin/apply.c:2783 #, 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:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" @@ -1533,321 +1530,321 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2912 +#: builtin/apply.c:2911 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas pÃ¥ \"%s\"" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, 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:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehÃ¥ll" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3526 +#: builtin/apply.c:3525 #, 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:3531 +#: builtin/apply.c:3530 #, 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:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s frÃ¥n indexet" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status pÃ¥ nyligen skapade filen \"%s\"" -#: builtin/apply.c:3787 +#: builtin/apply.c:3786 #, 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:3790 builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3959 +#: builtin/apply.c:3958 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, 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:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4288 +#: builtin/apply.c:4287 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "antal" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 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:4294 +#: builtin/apply.c:4293 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4296 +#: builtin/apply.c:4295 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:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" msgstr "visar antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4302 +#: builtin/apply.c:4301 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:4304 +#: builtin/apply.c:4303 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:4306 +#: builtin/apply.c:4305 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:4308 +#: builtin/apply.c:4307 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa ocksÃ¥ patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 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:4314 +#: builtin/apply.c:4313 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat pÃ¥ inbyggd indexinformation" -#: builtin/apply.c:4316 +#: builtin/apply.c:4315 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4319 +#: builtin/apply.c:4318 msgid "ensure at least <n> lines of context match" msgstr "se till att Ã¥tminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "Ã¥tgärd" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4324 builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4334 +#: builtin/apply.c:4333 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "tillÃ¥t överlappande stycken" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "var pratsam" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte pÃ¥ antalet linjer i styckehuvuden" -#: builtin/apply.c:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "rot" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, 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:4414 builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2110,7 +2107,7 @@ msgstr "sökväg \"%s\": kan inte slÃ¥ ihop" msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "indexfilen är trasig" @@ -2119,60 +2116,56 @@ msgstr "indexfilen är trasig" msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done misslyckades" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "du mÃ¥ste lösa ditt befintliga index först" -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "HEAD är nu pÃ¥" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "Ã…terställ gren \"%s\"\n" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "Redan pÃ¥ \"%s\"\n" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr " ... och %d till.\n" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2195,7 +2188,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2210,71 +2203,71 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "internt fel vid genomgÃ¥ng av revisioner (revision walk)" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "Du är pÃ¥ en gren som ännu inte är född" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" msgstr "-B kan inte användas med -b" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "--patch är inkompatibel med alla andra flaggor" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detcah kan inte användas med -b/-B/--orphan" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "--detach kan inte användas med -t" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "--track behöver ett namn pÃ¥ en gren" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan och -b|-B kan inte användas samtidigt" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "--orphan kan inte användas med -t" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f och -m är inkompatibla" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -2283,15 +2276,15 @@ msgstr "" "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach tar inte en sökväg som argument" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2299,11 +2292,11 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut frÃ¥n indexet." -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "Kan inte växla gren pÃ¥ en icke-incheckning." -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs är inkompatibla med att byta gren." @@ -2361,7 +2354,7 @@ msgstr "referensarkivet \"%s\" är inte en lokal katalog." msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status pÃ¥ \"%s\"" @@ -2376,11 +2369,6 @@ msgstr "%s finns och är ingen katalog" msgid "failed to stat %s\n" msgstr "misslyckades ta status pÃ¥ %s\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "misslyckades ta bort länken \"%s\"" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2772,7 +2760,7 @@ msgstr " (rotincheckning)" msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" @@ -2801,7 +2789,7 @@ msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter pÃ¥ grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" @@ -2908,36 +2896,36 @@ msgstr "Inga namn hittades, kan inte beskriva nÃ¥got." msgid "--dirty is incompatible with committishes" msgstr "--dirty är inkompatibelt med \"committish\"-värden" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "mer än %d träd angavs: \"%s\"" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än tvÃ¥ blobbar angavs: \"%s\"" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." @@ -3133,57 +3121,57 @@ msgstr "" msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa trÃ¥d. %s" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "Kunde inte byta katalog (chdir): %s" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" frÃ¥n objekt av typen %s" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:968 +#: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:971 +#: builtin/grep.c:1003 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:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "bÃ¥de --cached och träd angavs." @@ -3677,64 +3665,64 @@ msgstr "Behöver precis ett intervall." msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "TvÃ¥ utdatakataloger?" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1242 +#: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1397 +#: builtin/log.c:1394 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1501 +#: builtin/log.c:1498 #, 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:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" @@ -3797,51 +3785,51 @@ msgstr "Avslutar SQUASH_MSG" msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka pÃ¥ en incheckning" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "misslyckads läsa cachen" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte nÃ¥got annat än en sammanslagning av tvÃ¥ huvuden." -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa frÃ¥n \"%s\"" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" "Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra " "den.\n" -#: builtin/merge.c:892 +#: builtin/merge.c:891 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" @@ -3856,53 +3844,53 @@ msgstr "" "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Kunde inte slÃ¥ ihop automatiskt; fixa konflikter och checka in resultatet.\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "Inte pÃ¥ nÃ¥gon gren." -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Ingen fjärrspÃ¥rande gren för %s frÃ¥n %s" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte nÃ¥got vi kan slÃ¥ ihop" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3910,11 +3898,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slÃ¥ ihop." -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3922,79 +3910,79 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slÃ¥ ihop." -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)." -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "Kan endast slÃ¥ ihop en enda incheckning i ett tomt huvud." -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning pÃ¥ ett tomt huvud ännu" -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 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:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ã…terspolar trädet till orört...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslaning med strategin %s misslyckades.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, 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:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -4331,14 +4319,47 @@ msgstr "" "aktuella grenen \"%s\", utan att tala om för mig vad som\n" "skall sändas för att uppdatera fjärrgrenen." -#: builtin/push.c:174 +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" +"push.default har inte ställts in; dess underförstÃ¥dda värde ändras i\n" +"Git 2.0 frÃ¥n \"matching\" till \"simple\". För att undertrycka det här\n" +"meddelandet och behÃ¥lla nuvarande beteende efter att förvalet ändras,\n" +"skriver du:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"För att undertrycka meddelandet och välja det nya beteendet nu skriver du:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Se \"git help config\" och sök efter \"push.default\" för ytterligare \n" +"information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n" +"liknande läget \"current\" istället för \"simple\" om du ibland använder\n" +"äldre versioner av Git.)" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Du angav inga referensspecifikationer att sända, och push.default är " "\"nothing\"." -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4350,20 +4371,21 @@ msgstr "" "innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "Uppdateringar avvisades dÃ¥ änden pÃ¥ en insänd gren är bakom dess\n" "fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n" "du specificera grenar att sända, eller ändra inställningsvariabeln\n" -"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n" -"aktuell gren." +"\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att " +"endast\n" +"sända aktuell gren." -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4375,22 +4397,22 @@ 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:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4411,31 +4433,31 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -5807,33 +5829,33 @@ msgstr "(För att Ã¥terställa dem, skriv \"git stash apply\")" msgid "cannot strip one component off url '$remoteurl'" msgstr "kan inte ta bort en komponent frÃ¥n url:en \"$remoteurl\"" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, 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:189 +#: git-submodule.sh:211 #, 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:201 +#: git-submodule.sh:223 #, 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:290 +#: git-submodule.sh:312 #, 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:307 +#: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5844,64 +5866,64 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, 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:324 +#: git-submodule.sh:346 #, 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:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:348 +#: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "GÃ¥r in i \"$prefix$sm_path\"" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, 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:447 +#: git-submodule.sh:471 #, 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:456 +#: git-submodule.sh:480 #, 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:458 +#: git-submodule.sh:482 #, 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:466 +#: git-submodule.sh:490 #, 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:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5910,93 +5932,102 @@ msgstr "" "Undermodulen \"$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:578 +#: git-submodule.sh:603 #, 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:597 +#: git-submodule.sh:622 #, 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:611 +#: git-submodule.sh:636 #, 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:612 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:617 +#: git-submodule.sh:642 #, 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:618 +#: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:623 +#: git-submodule.sh:648 #, 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:624 +#: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:754 +#: git-submodule.sh:779 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:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehÃ¥ller inte incheckning $sha1_src" -#: git-submodule.sh:815 +#: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehÃ¥ller inte incheckning $sha1_dst" -#: git-submodule.sh:818 +#: git-submodule.sh:843 #, 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:843 +#: git-submodule.sh:868 msgid "blob" msgstr "blob" -#: git-submodule.sh:881 +#: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "# Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "# Undermodulers ändringar att checka in:" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synkroniserar undermodul-url för \"$name\"" +#~ msgid "diff setup failed" +#~ msgstr "misslyckades sätta upp för diff" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: disk full?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done misslyckades" + #~ msgid "%s: has been deleted/renamed" #~ msgstr "%s: har tagits bort/ändrat namn" @@ -2,23 +2,22 @@ # Copyright (C) 2012, Trần Ngá»c Quân. # This file is distributed under the same license as the git-core package. # First translated by Trần Ngá»c Quân <vnwildman@gmail.com>, 2012. +# Nguyá»…n Thái Ngá»c Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-1.7.12-rc1-18-ge0453\n" +"Project-Id-Version: git-1.7.12-146-g16d26\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-08-06 23:47+0800\n" -"PO-Revision-Date: 2012-08-07 07:11+0700\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"PO-Revision-Date: 2012-09-08 08:00+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" -"Language: \n" "Plural-Forms: nplurals=2; plural=1;\n" -"X-Poedit-Language: Vietnamese\n" -"X-Poedit-Country: VIET NAM\n" -"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" #: advice.c:40 @@ -38,9 +37,9 @@ msgid "" "or use 'git commit -a'." msgstr "" "Sá»a chúng trong cây là m việc,\n" -"và sau đó sá» dụng lệnh 'git add/rm <táºp-tin>'\n" +"và sau đó dùng lệnh 'git add/rm <táºp-tin>'\n" "dà nh riêng cho việc đánh dấu cần giải quyết và tạo lần chuyển giao,\n" -"hoặc là sá» dụng lệnh 'git commit -a'." +"hoặc là dùng lệnh 'git commit -a'." #: bundle.c:36 #, c-format @@ -52,8 +51,7 @@ msgstr "'%s' không giống nhÆ° táºp tin v2 bundle (cụm)" msgid "unrecognized header: %s%s (%d)" msgstr "phần đầu (header) không được thừa nháºn: %s%s (%d)" -#: bundle.c:89 -#: builtin/commit.c:699 +#: bundle.c:89 builtin/commit.c:699 #, c-format msgid "could not open '%s'" msgstr "không thể mở '%s'" @@ -62,14 +60,8 @@ msgstr "không thể mở '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "Khó chứa thiếu những lần chuyển giao (commit) cần trÆ°á»›c hết nà y:" -#: bundle.c:164 -#: sequencer.c:550 -#: sequencer.c:982 -#: builtin/log.c:290 -#: builtin/log.c:726 -#: builtin/log.c:1316 -#: builtin/log.c:1535 -#: builtin/merge.c:347 +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "Cà i đặt việc di chuyển qua các Ä‘iểm xét lại gặp lá»—i" @@ -96,9 +88,7 @@ msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) nà y" msgid "rev-list died" msgstr "rev-list bị chết" -#: bundle.c:300 -#: builtin/log.c:1212 -#: builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nháºn: %s" @@ -139,8 +129,7 @@ msgstr "không thể phân tÃch %s" msgid "%s %s is not a commit!" msgstr "%s %s không phải là má»™t lần commit!" -#: compat/obstack.c:406 -#: compat/obstack.c:408 +#: compat/obstack.c:406 compat/obstack.c:408 msgid "memory exhausted" msgstr "cạn bá»™ nhá»›" @@ -218,8 +207,7 @@ msgid_plural "%s, %lu months ago" msgstr[0] "%s, %lu tháng trÆ°á»›c" msgstr[1] "%s, %lu tháng trÆ°á»›c" -#: date.c:154 -#: date.c:159 +#: date.c:154 date.c:159 #, c-format msgid "%lu year ago" msgid_plural "%lu years ago" @@ -245,32 +233,32 @@ msgstr "" "Tìm thấy các lá»—i trong biến cấu hình 'diff.dirstat':\n" "%s" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" -msgstr " 0 có táºp tin nà o bị sá»a đổi" +msgstr " 0 có táºp tin nà o thay đổi cả" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" -msgstr[0] " %d táºp tin đã bị thay đổi" -msgstr[1] " %d táºp tin đã bị thay đổi" +msgstr[0] " %d táºp tin thay đổi" +msgstr[1] " %d táºp tin thay đổi" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" -msgstr[0] ", %d được thêm và o(+)" -msgstr[1] ", %d được thêm và o(+)" +msgstr[0] ", %d thêm(+)" +msgstr[1] ", %d thêm(+)" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" -msgstr[0] ", %d bị xóa(-)" -msgstr[1] ", %d bị xóa(-)" +msgstr[0] ", %d xóa(-)" +msgstr[1] ", %d xóa(-)" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -334,7 +322,7 @@ msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" "Continuing under the assumption that you meant '%s'" msgstr "" -"CẢNH BÃO: Bạn đã gá»i lệnh Git có tên '%s', mà nó lại không sẵn có.\n" +"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 @@ -345,7 +333,7 @@ msgstr "trong %0.1f giây má»™t cách tá»± Ä‘á»™ng..." #: help.c:366 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." -msgstr "git: '%s' không phải là má»™t lệnh của git. Xem thêm 'git --help'." +msgstr "git: '%s' không phải là má»™t lệnh của git. Xem 'git --help'." #: help.c:370 msgid "" @@ -375,244 +363,245 @@ msgstr "addinfo_cache gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn '%s'" msgid "error building trees" msgstr "gặp lá»—i khi xây dá»±ng cây" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "cà i đặt diff gặp lá»—i" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "merge-recursive: Ä‘Ä©a bị đầy?" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "gặp lá»—i khi tạo Ä‘Æ°á»ng dẫn '%s'%s" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Gỡ bá» %s để tạo chá»— (room) cho thÆ° mục con\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 -#: merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr ": có lẽ là má»™t xung Ä‘á»™t D/F?" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "từ chối đóng táºp tin không được theo vết tại '%s'" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "không thể Ä‘á»c đối tượng %s '%s'" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "đối tượng blob được mong đợi cho %s '%s'" -#: merge-recursive.c:791 -#: builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "gặp lá»—i khi mở '%s'" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" -msgstr "gặp lá»—i khi tạo liên kết tượng trÆ°ng symlink '%s'" +msgstr "gặp lá»—i khi tạo liên kết tượng trÆ°ng (symlink) '%s'" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "không hiểu phải là m gì vá»›i %06o %s '%s'" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "Gặp lá»—i khi thá»±c hiện trá»™n ná»™i bá»™" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "Không thể thêm %s và o cÆ¡ sở dữ liệu" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "kiểu đối tượng không được há»— trợ trong cây (tree)" -#: merge-recursive.c:1038 -#: merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree." -msgstr "XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s còn lại trong cây (tree)." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." +msgstr "" +"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " +"còn lại trong cây (tree)." -#: merge-recursive.c:1044 -#: merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format -msgid "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left in tree at %s." -msgstr "XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s còn lại trong cây (tree) tại %s." +msgid "" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." +msgstr "" +"XUNG ÄỘT (%s/xóa): %s bị xóa trong %s và %s trong %s. Phiên bản %s của %s " +"còn lại trong cây (tree) tại %s." -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "đổi tên" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "đã đổi tên" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s là má»™t thÆ° mục trong %s thay và o đó thêm và o nhÆ° là %s" -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format -msgid "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s\"->\"%s\" in \"%s\"%s" -msgstr "XUNG ÄỘT (đổi tên/đổi tên): Äổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi tên \"%s\"->\"%s\" trong \"%s\"%s" +msgid "" +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" +msgstr "" +"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên \"%s\"->\"%s\" trong nhánh \"%s\" đổi " +"tên \"%s\"->\"%s\" trong \"%s\"%s" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr " (cần giải quyết)" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" -msgstr "XUNG ÄỘT (đổi tên/đổi tên): Äổi tên %s->%s trong %s. Äổi tên %s->%s trong %s" +msgstr "" +"XUNG ÄỘT (đổi-tên/đổi-tên): Äổi tên %s->%s trong %s. Äổi tên %s->%s trong %s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "Äang đổi tên %s thà nh %s thay vì %s thà nh %s" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "XUNG ÄỘT (đổi tên/thêm): Äổi tên %s->%s trong %s. %s được thêm và o trong %s" +msgstr "" +"XUNG ÄỘT (đổi-tên/thêm): Äổi tên %s->%s trong %s. %s được thêm và o trong %s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "Thêm hòa trá»™n %s" -#: merge-recursive.c:1479 -#: merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "Thay và o đó thêm và o %s" -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "không thể Ä‘á»c đối tượng %s" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "đối tượng %s không phải là má»™t blob" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "sá»a đổi" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" -msgstr "đã sá»a" +msgstr "đã bị sá»a" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "ná»™i dung" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "thêm/thêm" -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" -msgstr "Äã bá» qua %s (đã sẵn có lần hòa trá»™n nà y)" +msgstr "Äã bá» qua %s (đã có sẵn lần hòa trá»™n nà y)" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "Tá»±-Ä‘á»™ng-hòa-trá»™n %s" -#: merge-recursive.c:1650 -#: git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "mô-Ä‘un con" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "XUNG ÄỘT (%s): Xung Ä‘á»™t hòa trá»™n trong %s" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "Äang xóa %s" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "táºp-tin/thÆ°-mục" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "thÆ°-mục/táºp tin" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" -msgstr "XUNG ÄỘT (%s): Ở đây không có thÆ° mục nà o có tên %s trong %s. Thêm %s nhÆ° là %s" +msgstr "" +"XUNG ÄỘT (%s): Ở đây không có thÆ° mục nà o có tên %s trong %s. Thêm %s nhÆ° là " +"%s" -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" -msgstr "Äang thêm \"%s\"" +msgstr "Thêm \"%s\"" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "Việc hòa trá»™n há»ng nghiêm trá»ng, không nên để xảy ra." -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "Äã cáºp nháºt rồi!" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "hòa trá»™n cây (tree) %s và %s gặp lá»—i" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "ÄÆ°á»ng dẫn chÆ°a được xá» lý??? %s" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "Äang trá»™n:" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "tìm thấy %u tổ tiên chung:" msgstr[1] "tìm thấy %u tổ tiên chung:" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "hòa trá»™n không trả vá» lần chuyển giao (commit) nà o" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "Không thể phân tÃch đối tượng '%s'" -#: merge-recursive.c:2026 -#: builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" @@ -623,14 +612,14 @@ msgstr "..." #: parse-options.c:512 #, c-format msgid "usage: %s" -msgstr "cách sá» dụng: %s" +msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation #: parse-options.c:516 #, c-format msgid " or: %s" -msgstr " hoặc: %s" +msgstr " hoặc: %s" #: parse-options.c:519 #, c-format @@ -647,9 +636,14 @@ msgstr[1] "Nhánh của bạn là đầu của '%s' bởi %d lần chuyển giao #: remote.c:1638 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" -msgstr[1] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể " +"được fast-forward.\n" +msgstr[1] "" +"Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể " +"được fast-forward.\n" #: remote.c:1646 #, c-format @@ -667,20 +661,14 @@ msgstr[1] "" "Your branch and '%s' have diverged,\n" "and have %d and %d different commit each, respectively.\n" -#: sequencer.c:121 -#: builtin/merge.c:865 -#: builtin/merge.c:978 -#: builtin/merge.c:1088 -#: builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "Không thể mở %s' để ghi" -#: sequencer.c:123 -#: builtin/merge.c:333 -#: builtin/merge.c:868 -#: builtin/merge.c:1090 -#: builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "Không thể ghi và o '%s'" @@ -703,9 +691,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:160 -#: sequencer.c:758 -#: sequencer.c:841 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi và o %s" @@ -725,7 +711,7 @@ msgstr "Các thay đổi ná»™i bá»™ của bạn có thể bị ghi đè bởi lá #: sequencer.c:183 msgid "Commit your changes or stash them to proceed." -msgstr "Chuyển giao (commit) các thay đổi hay stash chúng để tiến hà nh." +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:233 @@ -762,7 +748,9 @@ msgstr "Bạn không có HEAD nà o hợp lệ" #: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." -msgstr "Lần chuyển giao (commit) %s là má»™t lần hòa trá»™n nhÆ°ng không Ä‘Æ°a ra tùy chá»n -m." +msgstr "" +"Lần chuyển giao (commit) %s là má»™t lần hòa trá»™n nhÆ°ng không Ä‘Æ°a ra tùy chá»n -" +"m." #: sequencer.c:421 #, c-format @@ -772,7 +760,9 @@ msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" #: sequencer.c:425 #, c-format msgid "Mainline was specified but commit %s is not a merge." -msgstr "Luồng chÃnh được chỉ định nhÆ°ng lần chuyển giao (commit) %s không phải là má»™t lần hòa trá»™n." +msgstr "" +"Luồng chÃnh được chỉ ra nhÆ°ng lần chuyển giao (commit) %s không phải là má»™t " +"lần hòa trá»™n." #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 @@ -867,14 +857,12 @@ msgstr "hãy thá» \"git cherry-pick (--continue | --quit | --abort)\"" msgid "Could not create sequencer directory %s" msgstr "Không thể tạo thÆ° mục xếp dãy %s" -#: sequencer.c:760 -#: sequencer.c:845 +#: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "Lá»—i bao bá»c %s." -#: sequencer.c:779 -#: sequencer.c:913 +#: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" @@ -886,8 +874,7 @@ msgstr "không thể phân giải HEAD" msgid "cannot abort from a branch yet to be born" msgstr "không thể hủy bá» từ má»™t nhánh mà nó còn chÆ°a được tạo ra" -#: sequencer.c:805 -#: builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" @@ -936,7 +923,9 @@ msgstr "Không có dòng ngược (upstream) được cấu hình cho nhánh '%s #: sha1_name.c:1052 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "Nhánh dòng ngược (upstream) '%s' không được lÆ°u lại nhÆ° là má»™t nhánh 'remote-tracking'" +msgstr "" +"Nhánh dòng ngược (upstream) '%s' không được lÆ°u lại nhÆ° là má»™t nhánh 'remote-" +"tracking'" #: wrapper.c:413 #, c-format @@ -951,29 +940,28 @@ msgstr "không có ngÆ°á»i dùng nhÆ° váºy" msgid "Unmerged paths:" msgstr "Những Ä‘Æ°á»ng dẫn chÆ°a được hòa trá»™n:" -#: wt-status.c:167 -#: wt-status.c:194 +#: wt-status.c:167 wt-status.c:194 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" -msgstr " (sá» dụng \"git reset %s <táºp-tin>...\" để bá» má»™t stage (trạng thái))" +msgstr " (dùng \"git reset %s <táºp-tin>...\" để bá» má»™t stage (trạng thái))" -#: wt-status.c:169 -#: wt-status.c:196 +#: wt-status.c:169 wt-status.c:196 msgid " (use \"git rm --cached <file>...\" to unstage)" -msgstr " (sá» dụng \"git rm --cached <táºp-tin>...\" để bá» trạng thái (stage))" +msgstr " (dùng \"git rm --cached <táºp-tin>...\" để bá» trạng thái (stage))" #: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (sá» dụng \"git add <táºp-tin>...\" để đánh dấu là cần giải quyết)" +msgstr " (dùng \"git add <táºp-tin>...\" để đánh dấu là cần giải quyết)" -#: wt-status.c:175 -#: wt-status.c:179 +#: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" -msgstr " (sá» dụng \"git add/rm <táºp-tin>...\" nhÆ° là má»™t cách thÃch hợp để đánh dấu là cần được giải quyết)" +msgstr "" +" (dùng \"git add/rm <táºp-tin>...\" nhÆ° là má»™t cách thÃch hợp để đánh " +"dấu là cần được giải quyết)" #: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (sá» dụng \"git rm <táºp-tin>...\" để đánh dấu là cần giải quyết)" +msgstr " (dùng \"git rm <táºp-tin>...\" để đánh dấu là cần giải quyết)" #: wt-status.c:188 msgid "Changes to be committed:" @@ -981,33 +969,45 @@ msgstr "Những thay đổi sẽ được chuyển giao:" #: wt-status.c:206 msgid "Changes not staged for commit:" -msgstr "Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" +msgstr "" +"Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" #: wt-status.c:210 msgid " (use \"git add <file>...\" to update what will be committed)" -msgstr " (sá» dụng \"git add <táºp-tin>...\" để cáºp nháºt những gì cần chuyển giao (commit))" +msgstr "" +" (dùng \"git add <táºp-tin>...\" để cáºp nháºt những gì cần chuyển giao " +"(commit))" #: wt-status.c:212 msgid " (use \"git add/rm <file>...\" to update what will be committed)" -msgstr " (sá» dụng \"git add/rm <táºp_tin>...\" để cáºp nháºt những gì sẽ được chuyển giao)" +msgstr "" +" (dùng \"git add/rm <táºp-tin>...\" để cáºp nháºt những gì sẽ được chuyển " +"giao)" #: wt-status.c:213 -msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)" -msgstr " (sá» dụng \"git checkout -- <táºp_tin>...\" để loại bá» những thay đổi trong thÆ° mục là m việc)" +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" +" (dùng \"git checkout -- <táºp-tin>...\" để bá» thay đổi trong thÆ° mục là m " +"việc)" #: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" -msgstr " (chuyển giao (commit) hoặc là loại bá» các ná»™i dung không-bị-theo-vết hay đã bị chỉnh sá»a trong mô-Ä‘un-con)" +msgstr "" +" (chuyển giao (commit) hoặc là loại bá» các ná»™i dung không-bị-theo-vết hay " +"đã bị chỉnh sá»a trong mô-Ä‘un-con)" #: wt-status.c:224 #, c-format msgid "%s files:" -msgstr "%s tệp tin:" +msgstr "%s táºp tin:" #: wt-status.c:227 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" -msgstr " (sá» dụng \"git %s <táºp-tin>...\" để bao gồm thêm và o những gì cần chuyển giao (commit))" +msgstr "" +" (dùng \"git %s <táºp-tin>...\" để thêm và o những gì cần chuyển giao " +"(commit))" #: wt-status.c:244 msgid "bug" @@ -1043,15 +1043,15 @@ msgstr "bị sá»a bởi cả hai:" #: wt-status.c:285 msgid "new commits, " -msgstr " lần chuyển giao (commit) má»›i, " +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 được sá»a đổi, " #: wt-status.c:289 msgid "untracked content, " -msgstr "ná»™i dung chÆ°a được theo dõi" +msgstr "ná»™i dung chÆ°a được theo dõi, " #: wt-status.c:303 #, c-format @@ -1066,12 +1066,12 @@ msgstr "đã sao chép: %s -> %s" #: wt-status.c:309 #, c-format msgid "deleted: %s" -msgstr "bị xóa: %s" +msgstr "đã xóa: %s" #: wt-status.c:312 #, c-format msgid "modified: %s" -msgstr "bị sá»a đổi: %s" +msgstr "đã sá»a đổi: %s" #: wt-status.c:315 #, c-format @@ -1086,7 +1086,7 @@ msgstr "đổi-kiểu: %s" #: wt-status.c:321 #, c-format msgid "unknown: %s" -msgstr "không rõ: %s" +msgstr "không hiểu: %s" #: wt-status.c:324 #, c-format @@ -1102,8 +1102,7 @@ msgstr "lá»—i: không lấy được trạng thái lệnh diff %c" 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:788 wt-status.c:912 msgid " (fix conflicts and run \"git commit\")" msgstr " (sá»a các xung Ä‘á»™t sau đó chạy \"git commit\")" @@ -1113,7 +1112,7 @@ msgstr "Tất cả các xung Ä‘á»™t đã được giải quyết nhÆ°ng bạn vá #: wt-status.c:794 msgid " (use \"git commit\" to conclude merge)" -msgstr " (sá» dụng \"git commit\" để hoà n tất việc hòa trá»™n)" +msgstr " (dùng \"git commit\" để hoà n tất việc hòa trá»™n)" #: wt-status.c:804 msgid "You are in the middle of an am session." @@ -1129,14 +1128,13 @@ msgstr " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh \"git am --resolved #: wt-status.c:813 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (sá» dụng \"git am --skip\" để bá» qua lần vá nà y)" +msgstr " (dùng \"git am --skip\" để bá» qua lần vá nà y)" #: wt-status.c:815 msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " (sá» dụng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" +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:873 wt-status.c:883 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)." @@ -1146,23 +1144,28 @@ msgstr " (sá»a các xung Ä‘á»™t và sau đó chạy lệnh \"git rebase --cont #: wt-status.c:878 msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (sá» dụng \"git rebase --skip\" để bá» qua lần vá nà y)" +msgstr " (dùng \"git rebase --skip\" để bá» qua lần vá nà y)" #: wt-status.c:880 msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (sá» dụng \"git rebase --abort\" để check-out nhánh nguyên thủy)" +msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)" #: wt-status.c:886 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\")" +msgstr "" +" (khi tất cả các xung Ä‘á»™t đã sá»a xong: chạy lệnh \"git rebase --continue\")" #: wt-status.c:888 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." +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 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\")" +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 msgid "You are currently editing a commit during a rebase." @@ -1170,11 +1173,15 @@ msgstr "Bạn hiện Ä‘ang sá»a má»™t lần chuyển giao trong khi bạn thá»± #: wt-status.c:896 msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (sá» dụng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" +msgstr "" +" (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" #: wt-status.c:898 -msgid " (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr " (sá» 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)" +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 msgid "You are currently cherry-picking." @@ -1190,11 +1197,11 @@ msgstr "Bạn hiện tại Ä‘ang thá»±c hiện việc bisect (chia đôi)." #: wt-status.c:927 msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " (sá» dụng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" +msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" #: wt-status.c:978 msgid "On branch " -msgstr "Trên nhánh" +msgstr "Trên nhánh " #: wt-status.c:985 msgid "Not currently on any branch." @@ -1219,7 +1226,7 @@ msgstr "Những táºp tin không bị theo vết không được liệt kê ra % #: wt-status.c:1017 msgid " (use -u option to show untracked files)" -msgstr " (sá» dụng tùy chá»n -u để hiển thị các táºp tin chÆ°a được theo dõi)" +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 msgid "No changes" @@ -1232,31 +1239,31 @@ msgstr "không có thay đổi nà o được thêm và o lần chuyển giao (com #: wt-status.c:1029 msgid " (use \"git add\" and/or \"git commit -a\")" -msgstr " (sá» dụng \"git add\" và /hoặc \"git commit -a\")" +msgstr " (dùng \"git add\" và /hoặc \"git commit -a\")" #: wt-status.c:1031 #, c-format msgid "nothing added to commit but untracked files present%s\n" -msgstr "không có gì được thêm và o lần chuyển giao (commit) nhÆ°ng có những táºp tin không được theo dấu vết hiện diện%s\n" +msgstr "" +"không có gì được thêm và o lần chuyển giao (commit) nhÆ°ng có những táºp tin " +"không được theo dấu vết hiện diện%s\n" #: wt-status.c:1033 msgid " (use \"git add\" to track)" -msgstr " (sá» dụng \"git add\" để theo dõi dấu vết)" +msgstr " (dùng \"git add\" để theo dõi dấu vết)" -#: wt-status.c:1035 -#: wt-status.c:1038 -#: wt-status.c:1041 +#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041 #, c-format msgid "nothing to commit%s\n" msgstr "không có gì để chuyển giao (commit) %s\n" #: wt-status.c:1036 msgid " (create/copy files and use \"git add\" to track)" -msgstr " (tạo/sao-chép các táºp tin và sá» dụng \"git add\" để theo dõi dấu vết)" +msgstr " (tạo/sao-chép các táºp tin và dùng \"git add\" để theo dõi dấu vết)" #: wt-status.c:1039 msgid " (use -u to show untracked files)" -msgstr " (sá» dụng tùy chá»n -u để hiển thị các táºp tin chÆ°a được theo dõi)" +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:1042 msgid " (working directory clean)" @@ -1264,32 +1271,35 @@ msgstr " (thÆ° mục là m việc sạch sẽ)" #: wt-status.c:1150 msgid "HEAD (no branch)" -msgstr "HEAD (chÆ°a có nhánh nà o)" +msgstr "HEAD (không nhánh)" #: wt-status.c:1156 msgid "Initial commit on " -msgstr "Lần chuyển giao (commit) khởi tạo trên" +msgstr "Lần chuyển giao (commit) khởi tạo trên " #: wt-status.c:1171 msgid "behind " -msgstr "đằng sau" +msgstr "đằng sau " -#: wt-status.c:1174 -#: wt-status.c:1177 +#: wt-status.c:1174 wt-status.c:1177 msgid "ahead " -msgstr "phÃa trÆ°á»›c" +msgstr "phÃa trÆ°á»›c " #: wt-status.c:1179 msgid ", behind " -msgstr ", đằng sau" +msgstr ", đằng sau " + +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "bá» liên kết (unlink) %s không thà nh công" #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "trạng thái lệnh diff không nhÆ° mong đợi %c" -#: builtin/add.c:67 -#: builtin/commit.c:229 +#: builtin/add.c:67 builtin/commit.c:229 msgid "updating files failed" msgstr "Cáºp nháºt táºp tin gặp lá»—i" @@ -1305,11 +1315,10 @@ msgstr "ÄÆ°á»ng dẫn '%s' thì ở trong mô-Ä‘un-con '%.*s'" #: builtin/add.c:192 msgid "Unstaged changes after refreshing the index:" -msgstr "Các thay đổi không được lÆ°u trạng thái sau khi là m tÆ°Æ¡i má»›i lại bảng mục lục:" +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:459 -#: builtin/rm.c:186 +#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "pathspec '%s' không khá»›p vá»›i bất kỳ táºp tin nà o" @@ -1348,7 +1357,9 @@ msgstr "Không thể apply (áp dụng miếng vá) '%s'" #: builtin/add.c:312 msgid "The following paths are ignored by one of your .gitignore files:\n" -msgstr "Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các táºp tin .gitignore của bạn:\n" +msgstr "" +"Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các táºp tin .gitignore " +"của bạn:\n" #: builtin/add.c:352 #, c-format @@ -1369,7 +1380,7 @@ msgstr "-A và -u xung khắc nhau" #: builtin/add.c:393 msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "Tùy chá»n --ignore-missing chỉ có thể được sá» dụng cùng vá»›i --dry-run" +msgstr "Tùy chá»n --ignore-missing chỉ có thể được dùng cùng vá»›i --dry-run" #: builtin/add.c:413 #, c-format @@ -1381,18 +1392,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 nói là 'git add .' phải không?\n" -#: builtin/add.c:420 -#: builtin/clean.c:95 -#: builtin/commit.c:289 -#: builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "táºp tin ghi bảng mục lục bị há»ng" -#: builtin/add.c:480 -#: builtin/apply.c:4433 -#: builtin/mv.c:229 -#: builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Không thể ghi táºp tin lÆ°u bảng mục lục má»›i" @@ -1410,134 +1415,144 @@ msgstr "không nháºn ra tùy chá»n vá» khoảng trắng '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "không nháºn ra tùy chá»n bá» qua khoảng trắng '%s'" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" -msgstr "Không thể chuẩn bị biểu thức chÃnh qui dấu vết thá»i gian (timestamp regexp) %s" +msgstr "" +"Không thể chuẩn bị biểu thức chÃnh qui dấu vết thá»i gian (timestamp regexp) " +"%s" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "thi hà nh biểu thức chÃnh quy trả vá» %d cho kết xuất: %s" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "không thể tìm thấy tên táºp tin trong miếng vá tại dòng %d" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply: git-diff sai - mong đợi /dev/null, đã nháºn %s trên dòng %d" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply: git-diff sai - tên táºp tin má»›i mâu thuấn trên dòng %d" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply: git-diff sai - tên táºp tin cÅ© mâu thuấn trên dòng %d" -#: builtin/apply.c:958 +#: 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" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "chi tiết: dòng không được mong đợi: %.*s" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, 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:1477 +#: builtin/apply.c:1476 #, c-format -msgid "git diff header lacks filename information when removing %d leading pathname component (line %d)" -msgid_plural "git diff header lacks filename information when removing %d leading pathname components (line %d)" -msgstr[0] "phần đầu diff cho git thiếu thông tin tên táºp tin khi gỡ bá» Ä‘i %d trong thà nh phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)" -msgstr[1] "phần đầu diff cho git thiếu thông tin tên táºp tin khi gỡ bá» Ä‘i %d trong thà nh phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)" +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"phần đầu diff cho git thiếu thông tin tên táºp tin khi gỡ bá» Ä‘i %d trong " +"thà nh phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)" +msgstr[1] "" +"phần đầu diff cho git thiếu thông tin tên táºp tin khi gỡ bá» Ä‘i %d trong " +"thà nh phần dẫn đầu tên của Ä‘Æ°á»ng dẫn (dòng %d)" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 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:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "táºp tin đã xóa vẫn còn ná»™i dung" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá há»ng tại dòng %d" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, 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:1703 +#: builtin/apply.c:1702 #, 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:1706 +#: builtin/apply.c:1705 #, 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:1852 +#: builtin/apply.c:1851 #, 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:1881 +#: builtin/apply.c:1880 #, 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:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ vá»›i 'garbage' tại dòng %d" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, 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:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "không thể mở để Ä‘á»c hay ghi %s" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "ôi?" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: '%c'" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, 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:2784 +#: builtin/apply.c:2783 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" -msgstr "Ná»™i dung được giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" +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:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" @@ -1546,334 +1561,327 @@ msgstr "" "Trong khi Ä‘ang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, 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:2912 +#: builtin/apply.c:2911 #, 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:2918 +#: builtin/apply.c:2917 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "vá nhị phân cho '%s' tạo ra kết quả không chÃnh xác (Ä‘ang chá» %s, đã nháºn %s)" +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:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "vá gặp lá»—i: %s:%ld" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "không thể \"checkout\" %s" -#: builtin/apply.c:3106 -#: builtin/apply.c:3115 -#: builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "Ä‘á»c %s gặp lá»—i" -#: builtin/apply.c:3139 -#: builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "Ä‘Æ°á»ng dẫn %s đã bị xóa/đổi tên" -#: builtin/apply.c:3220 -#: builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, 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:3224 -#: builtin/apply.c:3367 -#: builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3229 -#: builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "%s: không khá»›p trong mục lục" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "loại bá» miếng vá để lại ná»™i dung táºp tin" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, mong chá» %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trÆ°á»›c trong bảng mục lục" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, 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:3526 +#: builtin/apply.c:3525 #, 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:3531 +#: builtin/apply.c:3530 #, 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:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "Äang kiểm tra miếng vá %s..." -#: builtin/apply.c:3607 -#: builtin/checkout.c:213 -#: builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry gặp lá»—i đối vá»›i Ä‘Æ°á»ng dẫn '%s'" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bá» %s từ mục lục" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "miếng vá sai há»ng cho dá»± án con (subproject) %s" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, 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:3787 +#: builtin/apply.c:3786 #, 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:3790 -#: builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, 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:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "Ä‘ang đóng táºp tin '%s'" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, 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:3959 +#: builtin/apply.c:3958 #, 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:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "lá»—i ná»™i bá»™" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, 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:3980 +#: builtin/apply.c:3979 #, 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:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhá»› #%d được áp dụng gá»n gà ng." -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d bị từ chối." -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "không thừa nháºn đầu và o" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 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:4284 -#: builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "Ä‘Æ°á»ng-dẫn" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 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:4288 +#: builtin/apply.c:4287 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:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "số" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 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:4294 +#: builtin/apply.c:4293 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:4296 +#: builtin/apply.c:4295 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" +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:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" -msgstr "hiển thị số lượng các dòng được thêm và o và xóa Ä‘i theo ký hiệu tháºp phân" +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:4302 +#: builtin/apply.c:4301 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:4304 +#: builtin/apply.c:4303 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:4306 +#: builtin/apply.c:4305 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:4308 +#: builtin/apply.c:4307 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:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "đồng thá»i áp dụng miếng vá (sá» dụng vá»›i tùy chá»n --stat/--summary/--check)" +msgstr "" +"đồng thá»i áp dụng miếng vá (dùng vá»›i tùy chá»n --stat/--summary/--check)" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 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:4314 +#: builtin/apply.c:4313 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" +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:4316 +#: builtin/apply.c:4315 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:4319 +#: builtin/apply.c:4318 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:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "hà nh Ä‘á»™ng" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 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:4324 -#: builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 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:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiá»u ngược" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 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:4334 +#: builtin/apply.c:4333 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:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhá»›" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "chi tiết" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "dung sai không chÃnh xác đã tìm thấy thiếu dòng má»›i tại cuối táºp tin" +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:4342 +#: builtin/apply.c:4341 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:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "root" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 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:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "--3way ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "--index ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "--cached ở ngoà i má»™t kho chứa" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá '%s'" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, 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:4414 -#: builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1935,7 +1943,7 @@ msgstr "" #: builtin/branch.c:180 msgid "cannot use -a with -d" -msgstr "không thể sá» dụng -a vá»›i -d" +msgstr "không thể dùng tùy chá»n -a vá»›i -d" #: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" @@ -1949,7 +1957,7 @@ msgstr "Không thể xóa nhánh '%s' cái mà bạn hiện nay Ä‘ang ở." #: builtin/branch.c:202 #, c-format msgid "remote branch '%s' not found." -msgstr "nhánh máy chủ '%s' không tìm thấy." +msgstr "không tìm thấy nhánh máy chủ '%s'." #: builtin/branch.c:203 #, c-format @@ -1983,16 +1991,16 @@ msgstr "Lá»—i khi xoá bá» nhánh '%s'" #: builtin/branch.c:233 #, c-format msgid "Deleted remote branch %s (was %s).\n" -msgstr "Nhánh máy chủ đã xóa %s (trÆ°á»›c là %s).\n" +msgstr "Nhánh máy chủ \"%s\" đã bị xóa (từng là %s).\n" #: builtin/branch.c:234 #, c-format msgid "Deleted branch %s (was %s).\n" -msgstr "Nhánh đã bị xóa '%s' (trÆ°á»›c là %s)\n" +msgstr "Nhánh '%s' đã bị xóa (từng là %s)\n" #: builtin/branch.c:239 msgid "Update of config-file failed" -msgstr "Cáºp nháºt tệp tin cấu hình gặp lá»—i" +msgstr "Cáºp nháºt táºp tin cấu hình gặp lá»—i" #: builtin/branch.c:337 #, c-format @@ -2031,7 +2039,7 @@ msgstr "[phÃa trÆ°á»›c %d, phÃa sau %d]" #: builtin/branch.c:535 msgid "(no branch)" -msgstr "(không có nhánh nà o)" +msgstr "(không nhánh)" #: builtin/branch.c:600 msgid "some refs could not be read" @@ -2044,7 +2052,7 @@ msgstr "không thể đổi tên nhánh hiện hà nh trong khi nó chẳng ở Ä #: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" -msgstr "tên nhánh sai: '%s'" +msgstr "Sai tên nhánh: '%s'" #: builtin/branch.c:638 msgid "Branch rename failed" @@ -2078,10 +2086,9 @@ msgstr "không thể ghi và o mẫu mô tả nhánh: %s" msgid "Failed to resolve HEAD as a valid ref." msgstr "Gặp lá»—i khi giải quyết HEAD nhÆ° là má»™t tham chiếu (ref) hợp lệ." -#: builtin/branch.c:788 -#: builtin/clone.c:561 +#: builtin/branch.c:788 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" -msgstr "HEAD không tìm thấy ở dÆ°á»›i refs/heads!" +msgstr "không tìm thấy HEAD ở dÆ°á»›i refs/heads!" #: builtin/branch.c:808 msgid "--column and --verbose are incompatible" @@ -2089,7 +2096,9 @@ msgstr "--column và --verbose xung khắc nhau" #: builtin/branch.c:857 msgid "-a and -r options to 'git branch' do not make sense with a branch name" -msgstr "hai tùy chá»n -a và -r áp dụng cho lệnh 'git branch' không hợp lý đối vá»›i tên nhánh" +msgstr "" +"hai tùy chá»n -a và -r áp dụng cho lệnh 'git branch' không hợp lý đối vá»›i tên " +"nhánh" #: builtin/bundle.c:47 #, c-format @@ -2104,14 +2113,12 @@ msgstr "Cần má»™t kho chứa để mà tạo má»™t bundle." msgid "Need a repository to unbundle." msgstr "Cần má»™t kho chứa để mà bung má»™t bundle." -#: builtin/checkout.c:114 -#: builtin/checkout.c:147 +#: builtin/checkout.c:114 builtin/checkout.c:147 #, c-format msgid "path '%s' does not have our version" msgstr "Ä‘Æ°á»ng dẫn '%s' không có các phiên bản của chúng ta" -#: builtin/checkout.c:116 -#: builtin/checkout.c:149 +#: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format msgid "path '%s' does not have their version" msgstr "Ä‘Æ°á»ng dẫn '%s' không có các phiên bản của chúng" @@ -2136,75 +2143,65 @@ msgstr "Ä‘Æ°á»ng dẫn '%s': không thể hòa trá»™n" msgid "Unable to add merge result for '%s'" msgstr "Không thể thêm kết quả hòa trá»™n cho '%s'" -#: builtin/checkout.c:235 -#: builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "táºp tin ghi bảng mục lục bị há»ng" -#: builtin/checkout.c:265 -#: builtin/checkout.c:272 +#: builtin/checkout.c:265 builtin/checkout.c:272 #, c-format msgid "path '%s' is unmerged" msgstr "Ä‘Æ°á»ng dẫn '%s' không được hòa trá»™n" -#: builtin/checkout.c:303 -#: builtin/checkout.c:499 -#: builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "không thể ghi táºp tin lÆ°u bảng mục lục má»›i" -#: builtin/checkout.c:320 -#: builtin/diff.c:302 -#: builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done gặp lá»—i" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "bạn cần phải giải quyết bảng mục lục hiện tại của bạn trÆ°á»›c đã!" -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Không thể thá»±c hiện reflog cho '%s'\n" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "HEAD hiện giá» tại" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "Äặt lại nhánh '%s'\n" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "Äã sẵn sà ng trên '%s'\n" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Äã chuyển tá»›i và reset nhánh '%s'\n" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Äã chuyển đến nhánh má»›i '%s'\n" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "Äã chuyển đến nhánh '%s'\n" -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr " ... và nhiá»u hÆ¡n %d.\n" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2217,17 +2214,19 @@ msgid_plural "" "\n" "%s\n" msgstr[0] "" -"Cảnh báo: bạn đã rá»i bở %d lần chuyển giao (commit) lại đằng sau, không được kết nối đến\n" +"Cảnh báo: bạn đã rá»i bá» %d lần chuyển giao (commit) lại đằng sau, không được " +"kết nối đến\n" "bất kỳ nhánh nà o của bạn:\n" "\n" "%s\n" msgstr[1] "" -"Cảnh báo: bạn đã rá»i bở %d lần chuyển giao (commit) lại đằng sau, không được kết nối đến\n" +"Cảnh báo: bạn đã rá»i bá» %d lần chuyển giao (commit) lại đằng sau, không được " +"kết nối đến\n" "bất kỳ nhánh nà o của bạn:\n" "\n" "%s\n" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2236,95 +2235,99 @@ msgid "" " git branch new_branch_name %s\n" "\n" msgstr "" -"Nếu bạn muốn giữ chúng bằng cách tạo ra má»™t nhánh má»›i, đây có lẽ là má»™t thá»i Ä‘iểm thÃch hợp\n" +"Nếu bạn muốn giữ chúng bằng cách tạo ra má»™t nhánh má»›i, đây có lẽ là má»™t thá»i " +"Ä‘iểm thÃch hợp\n" "để là m thế bằng lệnh:\n" "\n" " git branch tên_nhánh_má»›i %s\n" "\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "lá»—i ná»™i bá»™ trong khi di chuyển qua các Ä‘iểm xét lại" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "Vị trà kế trÆ°á»›c của HEAD là " -#: builtin/checkout.c:725 -#: builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "Bạn tại nhánh mà nó chÆ°a hỠđược sinh ra" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "tham chiếu sai: %s" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" -msgstr "tham chiếu không phải là cây:%s" +msgstr "tham chiếu không phải là má»™t cây (tree):%s" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" -msgstr "-B không thể được sá» dụng vá»›i -b" +msgstr "tùy chá»n -B không thể dùng -b" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "--patch xung khắc vá»›i tất cả các tùy chá»n khác" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" -msgstr "--detach không thể được sá» dụng vá»›i -b/-B/--orphan" +msgstr "--detach không thể được sá» dụng vá»›i tùy chá»n -b/-B/--orphan" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "--detach không thể được sá» dụng vá»›i tùy chá»n -t" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "--track cần tên má»™t nhánh" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "Thiếu tên nhánh; hãy thá» -b" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "Tùy chá»n --orphan và -b|-B loại từ lẫn nhau" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "--orphan không thể được sá» dụng vá»›i tùy chá»n -t" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f và -m xung khắc nhau" +msgstr "git checkout: hai tùy chá»n -f và -m xung khắc nhau" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "Ä‘Æ°á»ng dẫn đã cho không hợp lệ" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout: việc cáºp nháºt các Ä‘Æ°á»ng dẫn là xung khắc vá»›i việc chuyển đổi các nhánh..\n" -"Bạn đã có ý định checkout '%s' cái mà không thể được phân giải nhÆ° là lần chuyển giao (commit)?" +"git checkout: việc cáºp nháºt các Ä‘Æ°á»ng dẫn là xung khắc vá»›i việc chuyển đổi " +"các nhánh..\n" +"Bạn đã có ý định checkout '%s' cái mà không thể được phân giải nhÆ° là lần " +"chuyển giao (commit)?" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." -msgstr "git checkout: việc cáºp nháºt các Ä‘Æ°á»ng dẫn là xung khắc vá»›i việc chuyển đổi các nhánh." +msgstr "" +"git checkout: việc cáºp nháºt các Ä‘Æ°á»ng dẫn là xung khắc vá»›i việc chuyển đổi " +"các nhánh." -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach không nháºn má»™t đối số là đưá»ng dẫn" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -2332,11 +2335,11 @@ 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/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "Không thể chuyển đến má»™t non-commit." -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs là xung khắc nhau khi chuyển đổi các nhánh." @@ -2345,27 +2348,31 @@ msgid "-x and -X cannot be used together" msgstr "-x và -X không thể dùng cùng má»™t lúc vá»›i nhau" #: builtin/clean.c:82 -msgid "clean.requireForce set to true and neither -n nor -f given; refusing to clean" -msgstr "clean.requireForce được đặt thà nh true và không Ä‘Æ°a ra tùy chá»n -n mà cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)" +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce được đặt thà nh true và không Ä‘Æ°a ra tùy chá»n -n mà cÅ©ng " +"không -f; từ chối lệnh dá»n dẹp (clean)" #: builtin/clean.c:85 -msgid "clean.requireForce defaults to true and neither -n nor -f given; refusing to clean" -msgstr "clean.requireForce mặc định được đặt thà nh true và không Ä‘Æ°a ra tùy chá»n -n mà cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)" +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce mặc định được đặt thà nh true và không Ä‘Æ°a ra tùy chá»n -n " +"mà cÅ©ng không -f; từ chối lệnh dá»n dẹp (clean)" -#: builtin/clean.c:155 -#: builtin/clean.c:176 +#: 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 +#: 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 +#: builtin/clean.c:162 builtin/clean.c:182 #, c-format msgid "failed to remove %s" msgstr "gặp lá»—i khi gỡ bá» %s" @@ -2390,8 +2397,7 @@ msgstr "kho tham chiếu '%s' không phải là má»™t thÆ° mục ná»™i bá»™." msgid "failed to create directory '%s'" msgstr "tạo thÆ° mục \"%s\" gặp lá»—i" -#: builtin/clone.c:308 -#: builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "gặp lá»—i stat (lấy trạng thái vá») '%s'" @@ -2406,20 +2412,15 @@ msgstr "%s tồn tại nhÆ°ng không phải là má»™t thÆ° mục" msgid "failed to stat %s\n" msgstr "lá»—i stat (lấy trạng thái vá») %s\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "bá» liên kết (unlink) %s không thà nh công" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" -msgstr "tạo được liên kết má»m tá»›i %s gặp lá»—i" +msgstr "gặp lá»—i khi tạo được liên kết má»m %s" #: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" -msgstr "sao chép tệp tin tá»›i '%s' gặp lá»—i" +msgstr "gặp lá»—i khi chép táºp tin tá»›i '%s'" #: builtin/clone.c:373 #, c-format @@ -2467,8 +2468,7 @@ msgstr "Ä‘Æ°á»ng dẫn Ä‘Ãch '%s' đã có từ trÆ°á»›c và không phải là 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:709 -#: builtin/clone.c:723 +#: builtin/clone.c:709 builtin/clone.c:723 #, 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'" @@ -2519,14 +2519,18 @@ msgid "" "\n" " git commit --amend --reset-author\n" msgstr "" -"Tên và địa chỉ thÆ° Ä‘iện tá» của bạn được cấu hình má»™t cách tá»± Ä‘á»™ng trên cÆ¡ sở\n" -"tà i khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chÃnh xác không.\n" -"Bạn có thể chặn những thông báo kiểu nà y bằng cách cà i đặt các thông tin trên má»™t cách rõ rà ng:\n" +"Tên và địa chỉ thÆ° Ä‘iện tá» của bạn được cấu hình má»™t cách tá»± Ä‘á»™ng trên cÆ¡ " +"sở\n" +"tà i khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chÃnh " +"xác không.\n" +"Bạn có thể chặn những thông báo kiểu nà y bằng cách cà i đặt các thông tin " +"trên má»™t cách rõ rà ng:\n" "\n" " git config --global user.name \"Tên của bạn\"\n" " git config --global user.email you@example.com\n" "\n" -"Sau khi thá»±c hiện xong, bạn có thể sá»a chữa định danh được sá» dụng cho lần chuyển giao (commit) nà y vá»›i lệnh:\n" +"Sau khi thá»±c hiện xong, bạn có thể sá»a chữa định danh được sá» dụng cho lần " +"chuyển giao (commit) nà y vá»›i lệnh:\n" "\n" " git commit --amend --reset-author\n" @@ -2536,8 +2540,10 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"Bạn đã yêu cầu amend (tu bổ) phần lá»›n các lần chuyển giao (commit) gần đây, nhÆ°ng là m nhÆ° thế\n" -"có thể là m cho nó trở nên trống rá»—ng. Bạn có thể lặp lại lệnh của mình bằng --allow-empty,\n" +"Bạn đã yêu cầu amend (tu bổ) phần lá»›n các lần chuyển giao (commit) gần đây, " +"nhÆ°ng là m nhÆ° thế\n" +"có thể là m cho nó trở nên trống rá»—ng. Bạn có thể lặp lại lệnh của mình bằng " +"--allow-empty,\n" "hoặc là bạn gỡ bá» các lần chuyển giao má»™t cách hoà n toà n bằng lệnh:\n" "\"git reset HEAD^\".\n" @@ -2550,12 +2556,13 @@ msgid "" "\n" "Otherwise, please use 'git reset'\n" msgstr "" -"Lần cherry-pick trÆ°á»›c hiện nay trống rá»—ng, có lẽ là bởi vì sá»± phân giải xung Ä‘á»™t.\n" +"Lần cherry-pick trÆ°á»›c hiện nay trống rá»—ng, có lẽ là bởi vì sá»± phân giải xung " +"Ä‘á»™t.\n" "Nếu bạn muốn chuyển giao nó cho dù thế nà o Ä‘i nữa, sá» dụng:\n" "\n" " git commit --allow-empty\n" "\n" -"Nếu không, hãy thá» sá» dụng 'git reset'\n" +"Nếu không, hãy thá» dùng 'git reset'\n" #: builtin/commit.c:256 msgid "failed to unpack HEAD tree object" @@ -2569,19 +2576,21 @@ msgstr "không thể tạo bảng mục lục tạm thá»i" msgid "interactive add failed" msgstr "việc thêm tÆ°Æ¡ng tác gặp lá»—i" -#: builtin/commit.c:337 -#: builtin/commit.c:358 -#: builtin/commit.c:408 +#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 msgid "unable to write new_index file" msgstr "không thể ghi táºp tin lÆ°u bảng mục lục má»›i (new_index)" #: builtin/commit.c:389 msgid "cannot do a partial commit during a merge." -msgstr "không thể thá»±c hiện việc chuyển giao (commit) cục bá»™ trong khi Ä‘ang được hòa trá»™n." +msgstr "" +"không thể thá»±c hiện việc chuyển giao (commit) cục bá»™ trong khi Ä‘ang được hòa " +"trá»™n." #: builtin/commit.c:391 msgid "cannot do a partial commit during a cherry-pick." -msgstr "không thể thá»±c hiện việc chuyển giao (commit) bá»™ pháºn trong khi Ä‘ang cherry-pick." +msgstr "" +"không thể thá»±c hiện việc chuyển giao (commit) bá»™ pháºn trong khi Ä‘ang cherry-" +"pick." #: builtin/commit.c:401 msgid "cannot read the index" @@ -2591,8 +2600,7 @@ msgstr "không Ä‘á»c được bảng mục lục" msgid "unable to write temporary index file" msgstr "không thể ghi táºp tin lÆ°u bảng mục lục tạm thá»i" -#: builtin/commit.c:496 -#: builtin/commit.c:502 +#: builtin/commit.c:496 builtin/commit.c:502 #, c-format msgid "invalid commit: %s" msgstr "lần chuyển giao (commit) không hợp lệ: %s" @@ -2606,15 +2614,12 @@ msgstr "đối số --author bị dị hình" msgid "Malformed ident string: '%s'" msgstr "Chuá»—i thụt lỠđầu dòng dị hình: '%s'" -#: builtin/commit.c:623 -#: builtin/commit.c:656 -#: builtin/commit.c:970 +#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970 #, c-format msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:635 -#: builtin/shortlog.c:296 +#: builtin/commit.c:635 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(Ä‘ang Ä‘á»c thông Ä‘iệp nháºt ký từ đầu và o tiêu chuẩn)\n" @@ -2684,8 +2689,10 @@ msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"Hãy nháºp và o các thông tin để giải thÃch các thay đổi của bạn. Những dòng được\n" -"bắt đầu bằng '#' sẽ được bá» qua, phần chú thÃch nà y nếu rá»—ng sẽ là m hủy bá» lần chuyển giao (commit).\n" +"Hãy nháºp và o các thông tin để giải thÃch các thay đổi của bạn. Những dòng " +"được\n" +"bắt đầu bằng '#' sẽ được bá» qua, phần chú thÃch nà y nếu rá»—ng sẽ là m hủy bá» " +"lần chuyển giao (commit).\n" #: builtin/commit.c:756 msgid "" @@ -2693,7 +2700,8 @@ msgid "" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Hãy nháºp và o các thông tin để giải thÃch các thay đổi của bạn.Những dòng được\n" +"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" @@ -2715,8 +2723,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:848 -#: builtin/tag.c:361 +#: builtin/commit.c:848 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Xin hãy áp dụng thông Ä‘iệp sá» dụng hoặc là tùy chá»n -m hoặc là -F.\n" @@ -2724,10 +2731,9 @@ msgstr "Xin hãy áp dụng thông Ä‘iệp sá» dụng hoặc là tùy chá»n -m #: builtin/commit.c:945 #, c-format msgid "No existing author found with '%s'" -msgstr "Không tìm thấy tác giả đã sẵn có vá»›i '%s'" +msgstr "Không tìm thấy tác giả có sẵn vá»›i '%s'" -#: builtin/commit.c:960 -#: builtin/commit.c:1160 +#: builtin/commit.c:960 builtin/commit.c:1160 #, 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'" @@ -2742,11 +2748,14 @@ msgstr "Không có gì để amend (tu bổ) cả." #: builtin/commit.c:1014 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ổ)." +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:1016 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ổ)." +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:1019 msgid "Options --squash and --fixup cannot be used together" @@ -2762,11 +2771,14 @@ msgstr "Tùy chá»n -m không thể được tổ hợp cùng vá»›i -c/-C/-F/--f #: builtin/commit.c:1039 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." +msgstr "" +"--reset-author chỉ có thể được sá» dụng vá»›i tùy chá»n -C, -c hay --amend." #: builtin/commit.c:1056 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." +msgstr "" +"Chỉ má»™t trong các tùy chá»n --include/--only/--all/--interactive/--patch được " +"sá» dụng." #: builtin/commit.c:1058 msgid "No paths with --include/--only does not make sense." @@ -2774,14 +2786,15 @@ msgstr "Không Ä‘Æ°á»ng dẫn vá»›i các tùy chá»n --include/--only không há #: builtin/commit.c:1060 msgid "Clever... amending the last one with dirty index." -msgstr "Giá»i... Ä‘ang tu bổ cái cuối vá»›i bảng mục lục phi nghÄ©a." +msgstr "Giá»i... tu bổ cái cuối vá»›i bảng mục lục phi nghÄ©a." #: builtin/commit.c:1062 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..." +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:1072 -#: builtin/tag.c:577 +#: builtin/commit.c:1072 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế Ä‘á»™ dá»n dẹp không hợp lệ %s" @@ -2796,7 +2809,8 @@ msgstr "không thể tìm thấy lần chuyển giao (commit) má»›i hÆ¡n đã Ä‘ #: builtin/commit.c:1262 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" +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:1303 msgid "detached HEAD" @@ -2810,8 +2824,7 @@ msgstr " (root-commit)" 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:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở %s' để Ä‘á»c" @@ -2833,16 +2846,17 @@ msgstr "không thể Ä‘á»c thông Ä‘iệp (message) commit (lần chuyển giao #: builtin/commit.c:1534 #, 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" +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 #, 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" +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:936 -#: builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "gặp lá»—i khi ghi đối tượng chuyển giao (commit)" @@ -2852,7 +2866,7 @@ msgstr "không thể khóa HEAD ref (tham chiếu)" #: builtin/commit.c:1579 msgid "cannot update HEAD ref" -msgstr "không thể cáºp nháºt HEAD ref (tham chiếu)" +msgstr "không thể cáºp nháºt ref (tham chiếu) HEAD" #: builtin/commit.c:1590 msgid "" @@ -2862,7 +2876,8 @@ msgid "" msgstr "" "Kho chứa đã hoà n tất việc cáºp nháºt, nhÆ°ng không thể ghi và o\n" "táºp tin new_index (bảng mục lục má»›i). Hãy kiểm tra xem Ä‘Ä©a có bị đầy quá\n" -"hay quota (hạn nghạch Ä‘Ä©a cứng) bị vượt quá, và sau đó \"git reset HEAD\" để khắc phục." +"hay quota (hạn nghạch Ä‘Ä©a cứng) bị vượt quá, và sau đó \"git reset HEAD\" để " +"khắc phục." #: builtin/describe.c:234 #, c-format @@ -2948,36 +2963,36 @@ msgstr "Không tìm thấy các tên, không thể mô tả gì cả." msgid "--dirty is incompatible with committishes" msgstr "--dirty là xung khắc vá»›i các tùy chá»n dà nh cho chuyển giao (commit)" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s': không phải táºp tin bình thÆ°á»ng hay liên kết tượng trÆ°ng" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "tùy chá»n sai: %s" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "Không phải là kho git" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "đối tượng đã cho '%s' không hợp lệ." -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "đã chỉ ra nhiá»u hÆ¡n %d cây (tree): '%s'" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "đã cho nhiá»u hÆ¡n hai đối tượng blob: '%s'" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "đã cho đối tượng không thể nắm giữ '%s'." @@ -2998,10 +3013,9 @@ msgstr "[đã cáºp nháºt]" #: builtin/fetch.c:273 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" -msgstr "! %-*s %-*s -> %s (không thể fetch (lấy vá») trong nhánh hiện hà nh)" +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:274 builtin/fetch.c:360 msgid "[rejected]" msgstr "[Bị từ chối]" @@ -3009,9 +3023,7 @@ msgstr "[Bị từ chối]" msgid "[tag update]" msgstr "[cáºp nháºt thẻ]" -#: builtin/fetch.c:287 -#: builtin/fetch.c:322 -#: builtin/fetch.c:340 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 msgid " (unable to update local ref)" msgstr " (không thể cáºp nháºt tham chiếu (ref) ná»™i bá»™)" @@ -3039,8 +3051,7 @@ msgstr "cưỡng bức cáºp nháºt" msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:393 -#: builtin/fetch.c:685 +#: builtin/fetch.c:393 builtin/fetch.c:685 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" @@ -3067,26 +3078,27 @@ msgstr "" #: builtin/fetch.c:549 #, c-format msgid " (%s will become dangling)" -msgstr " (%s sẽ trở thà nh lủng lẳng (không được quản lý))" +msgstr " (%s sẽ trở thà nh không đầu (không được quản lý))" #: builtin/fetch.c:550 #, c-format msgid " (%s has become dangling)" -msgstr " (%s phải trở thà nh lủng lẳng (không được quản lý))" +msgstr " (%s đã trở thà nh không đầu (không được quản lý))" #: builtin/fetch.c:557 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:558 -#: builtin/remote.c:1055 +#: builtin/fetch.c:558 builtin/remote.c:1055 msgid "(none)" msgstr "(không)" #: builtin/fetch.c:675 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" -msgstr "Từ chối việc lấy (fetch) và o trong nhánh hiện tại %s của má»™t kho chứa không phải kho trần (bare)" +msgstr "" +"Từ chối việc lấy (fetch) và o trong nhánh hiện tại %s của má»™t kho chứa không " +"phải kho trần (bare)" #: builtin/fetch.c:709 #, c-format @@ -3108,8 +3120,7 @@ msgstr "Tùy chá»n \"%s\" bị bá» qua vá»›i %s\n" msgid "Fetching %s\n" msgstr "Äang lấy (fetch) %s\n" -#: builtin/fetch.c:890 -#: builtin/remote.c:100 +#: builtin/fetch.c:890 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "không thể fetch (lấy) %s" @@ -3128,11 +3139,11 @@ msgstr "Bạn phải định rõ tên thẻ." #: builtin/fetch.c:979 msgid "fetch --all does not take a repository argument" -msgstr "lệnh lấy vá» sá» dụng tùy chá»n --all sẽ không lấy đối số kho chứa" +msgstr "lệnh lấy vá» \"fetch --all\" không lấy đối số kho chứa" #: builtin/fetch.c:981 msgid "fetch --all does not make sense with refspecs" -msgstr "lệnh lấy vá» fetch sá» dụng tùy chá»n --all không hợp lý vá»›i refspecs" +msgstr "lệnh lấy vá» \"fetch --all\" không hợp lý vá»›i refspecs" #: builtin/fetch.c:992 #, c-format @@ -3165,69 +3176,74 @@ msgid "" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Tá»± Ä‘á»™ng đóng gói kho chứa để tối Æ°u hóa hiệu suất là m việc.\n" -"chạy lệnh \"git gc\" má»™t cách thủ công. Hãy xem \"git help gc\" để biết thêm chi tiết.\n" +"chạy lệnh \"git gc\" má»™t cách thủ công. Hãy xem \"git help gc\" để biết thêm " +"chi tiết.\n" #: builtin/gc.c:251 -msgid "There are too many unreachable loose objects; run 'git prune' to remove them." -msgstr "Có quá nhiá»u đối tượng tá»± do không được dùng đến; hãy chạy lệnh 'git prune' để xóa bá» chúng Ä‘i." +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" +"Có quá nhiá»u đối tượng tá»± do không được dùng đến; hãy chạy lệnh 'git prune' " +"để xóa bá» chúng Ä‘i." #: builtin/grep.c:216 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: gặp lá»—i tạo tuyến (thread): %s" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "Gặp lá»—i vá»›i lệnh chdir: %s" -#: builtin/grep.c:478 -#: builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "không thể Ä‘á»c cây (%s)" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "không thể thá»±c hiện lệnh grep (lá»c tìm) từ đối tượng thuá»™c kiểu %s" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "chuyển đến `%c' mong chá» má»™t giá trị bằng số" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "không mở được '%s'" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "chÆ°a chỉ ra mẫu." -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "đối tượng sai %s" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager chỉ là m việc trên cây-là m-việc" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached hay --untracked không được sá» dụng vá»›i --no-index." -#: builtin/grep.c:968 +#: builtin/grep.c:1000 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." +msgstr "" +"--no-index hay --untracked không được sá» dụng cùng vá»›i các tùy chá»n liên " +"quan đến revs." -#: builtin/grep.c:971 +#: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard không thể sá» dụng cho ná»™i dung lÆ°u dấu vết." -#: builtin/grep.c:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -3249,10 +3265,7 @@ msgstr "Gặp lá»—i khi phân tÃch phiên bản emacsclient." 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:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 #, c-format msgid "failed to exec '%s': %s" msgstr "gặp lá»—i khi thá»±c thi '%s': %s" @@ -3292,8 +3305,7 @@ msgstr "không có trình xem trợ giúp dạng manpage tiếp hợp vá»›i yêu 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:447 builtin/help.c:454 #, c-format msgid "usage: %s%s" msgstr "cách sá» dụng: %s%s" @@ -3387,17 +3399,13 @@ msgstr[1] "táºp tin pack bị kết thúc sá»›m, %lu byte bị thiếu" msgid "serious inflate inconsistency" msgstr "sá»± mâu thuẫn xả nén nghiêm trá»ng" -#: builtin/index-pack.c:649 -#: builtin/index-pack.c:655 -#: builtin/index-pack.c:678 -#: builtin/index-pack.c:712 -#: builtin/index-pack.c:721 +#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678 +#: builtin/index-pack.c:712 builtin/index-pack.c:721 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "Sá»° VA CHẠM SHA1 Äà XẢY RA VỚI %s!" -#: builtin/index-pack.c:652 -#: builtin/pack-objects.c:170 +#: builtin/index-pack.c:652 builtin/pack-objects.c:170 #: builtin/pack-objects.c:262 #, c-format msgid "unable to read %s" @@ -3427,8 +3435,7 @@ msgstr "Lá»—i trong đối tượng" msgid "Not all child objects of %s are reachable" msgstr "Không phải tất cả các đối tượng con của %s là có thể vá»›i tá»›i được" -#: builtin/index-pack.c:821 -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:821 builtin/index-pack.c:847 msgid "failed to apply delta" msgstr "gặp lá»—i khi áp dụng delta" @@ -3506,7 +3513,7 @@ msgstr "không thể lÆ°u trữ táºp tin ghi mục lục" #: builtin/index-pack.c:1398 #, c-format msgid "Cannot open existing pack file '%s'" -msgstr "Không thể mở táºp tin pack đã sẵn có '%s' " +msgstr "Không thể mở táºp tin pack đã sẵn có '%s'" #: builtin/index-pack.c:1400 #, c-format @@ -3531,10 +3538,8 @@ msgstr[1] "chiá»u dà i xÃch = %d: %lu đối tượng" msgid "Cannot come back to cwd" msgstr "Không thể quay lại cwd" -#: builtin/index-pack.c:1525 -#: builtin/index-pack.c:1528 -#: builtin/index-pack.c:1540 -#: builtin/index-pack.c:1544 +#: builtin/index-pack.c:1525 builtin/index-pack.c:1528 +#: builtin/index-pack.c:1540 builtin/index-pack.c:1544 #, c-format msgid "bad %s" msgstr "%s sai" @@ -3543,8 +3548,7 @@ msgstr "%s sai" msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin không thể được dùng mà không có --stdin" -#: builtin/index-pack.c:1562 -#: builtin/index-pack.c:1572 +#: builtin/index-pack.c:1562 builtin/index-pack.c:1572 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "tên táºp tin packfile '%s' không được kết thúc bằng Ä‘uôi '.pack'" @@ -3623,16 +3627,15 @@ msgstr "không sao chép các mẫu của phiên bản sai định dạng %d tá» msgid "insane git directory %s" msgstr "thÆ° mục git Ä‘iên rồ %s" -#: builtin/init-db.c:323 -#: builtin/init-db.c:326 +#: builtin/init-db.c:323 builtin/init-db.c:326 #, c-format msgid "%s already exists" -msgstr "%s đã tồn tại rồi" +msgstr "%s đã có từ trÆ°á»›c rồi" #: builtin/init-db.c:355 #, c-format msgid "unable to handle file type %d" -msgstr "không thể handle tệp tin kiểu %d" +msgstr "không thể nắm (handle) táºp tin kiểu %d" #: builtin/init-db.c:358 #, c-format @@ -3670,8 +3673,7 @@ msgstr " đã chia sẻ" msgid "cannot tell cwd" msgstr "không nói chuyện được vá»›i lệnh cwd" -#: builtin/init-db.c:522 -#: builtin/init-db.c:529 +#: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format msgid "cannot mkdir %s" msgstr "không thể mkdir (tạo thÆ° mục): %s" @@ -3683,8 +3685,12 @@ msgstr "không thể chdir (chuyển đổi thÆ° mục) sang %s" #: builtin/init-db.c:555 #, c-format -msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" -msgstr "%s (hoặc --work-tree=<thÆ°-mục>) không cho phép không chỉ định %s (hoặc --git-dir=<thÆ°-mục>)" +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (hoặc --work-tree=<thÆ°-mục>) không cho phép không chỉ định %s (hoặc --git-" +"dir=<thÆ°-mục>)" #: builtin/init-db.c:579 msgid "Cannot access current working directory" @@ -3700,8 +3706,7 @@ msgstr "không thể truy cáºp cây (tree) là m việc '%s'" msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:403 -#: builtin/log.c:494 +#: builtin/log.c:403 builtin/log.c:494 #, c-format msgid "Could not read object %s" msgstr "Không thể Ä‘á»c đối tượng %s" @@ -3732,65 +3737,66 @@ msgstr "Cần chÃnh xác má»™t vùng." msgid "Not a range." msgstr "Không phải là má»™t vùng." -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "'Cover letter' cần cho định dạng thÆ°" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to Ä‘iên rồ: %s" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "Hai thÆ° mục kết xuất?" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, 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:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1242 +#: builtin/log.c:1239 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:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thÆ° mục '%s'" -#: builtin/log.c:1397 +#: builtin/log.c:1394 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:1501 +#: builtin/log.c:1498 #, c-format -msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n" -msgstr "Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <dòng-ngược> má»™t cách thủ công.\n" +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" +"Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <dòng-ngược> má»™t cách " +"thủ công.\n" -#: builtin/log.c:1517 -#: builtin/log.c:1519 -#: builtin/log.c:1531 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao (commit) %s" @@ -3827,14 +3833,13 @@ msgstr "stash gặp lá»—i" msgid "not a valid object: %s" msgstr "không phải là má»™t đối tượng hợp lệ: %s" -#: builtin/merge.c:269 -#: builtin/merge.c:286 +#: builtin/merge.c:269 builtin/merge.c:286 msgid "read-tree failed" msgstr "read-tree gặp lá»—i" #: builtin/merge.c:316 msgid " (nothing to squash)" -msgstr " (không có ghì để squash)" +msgstr " (không có gì để squash)" #: builtin/merge.c:329 #, c-format @@ -3854,49 +3859,51 @@ msgstr "Hoà n thà nh SQUASH_MSG" msgid "No merge message -- not updating HEAD\n" msgstr "Không thông Ä‘iệp hòa trá»™n -- không cáºp nháºt HEAD\n" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' không chỉ đến má»™t lần chuyển giao (commit) nà o cả" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Chuá»—i branch.%s.mergeoptions sai: %s" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "lệnh git write-tree gặp lá»—i khi ghi má»™t cây" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "gặp lá»—i khi Ä‘á»c bá»™ nhá»› tạm" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "Không cầm nắm gì ngoà i hai head hòa trá»™n" -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Không hiểu tùy chá»n cho merge-recursive: -X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" -msgstr "không ghi được %s" +msgstr "không thể ghi %s" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "Không thể Ä‘á»c từ '%s'" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" -msgstr "Vẫn chÆ°a hòa trá»™n các lần chuyển giao (commit); sá» dụng lệnh 'git commit' để hoà n tất việc hòa trá»™n.\n" +msgstr "" +"Vẫn chÆ°a hòa trá»™n các lần chuyển giao (commit); sá» dụng lệnh 'git commit' để " +"hoà n tất việc hòa trá»™n.\n" -#: builtin/merge.c:892 +#: builtin/merge.c:891 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" @@ -3904,60 +3911,64 @@ msgid "" "Lines starting with '#' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" -"Hãy nháºp và o các thông tin để giải thÃch tại sao sá»± hòa trá»™n nà y là cần thiết,\n" -"đặc biệt là khi nó hòa trá»™n dòng ngược đã cáºp nháºt và o trong má»™t nhánh topic.\n" +"Hãy nháºp và o các thông tin để giải thÃch tại sao sá»± hòa trá»™n nà y là cần " +"thiết,\n" +"đặc biệt là khi nó hòa trá»™n dòng ngược đã cáºp nháºt và o trong má»™t nhánh " +"topic.\n" "\n" -"Những dòng được bắt đầu bằng '#' sẽ được bá» qua, và phần chú thÃch nà y nếu rá»—ng\n" +"Những dòng được bắt đầu bằng '#' sẽ được bá» qua, và phần chú thÃch nà y nếu " +"rá»—ng\n" "sẽ là m hủy bá» lần chuyển giao (commit).\n" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "Chú thÃch của lần commit (chuyển giao) bị trống rá»—ng." -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "Thần kỳ.\n" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" -msgstr "Việc tá»± Ä‘á»™ng hòa trá»™n gặp lá»—i; hãy sá»a các xung Ä‘á»™t sau đó chuyển giao (commit) kết quả.\n" +msgstr "" +"Việc tá»± Ä‘á»™ng hòa trá»™n gặp lá»—i; hãy sá»a các xung Ä‘á»™t sau đó chuyển giao " +"(commit) kết quả.\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "%s không phải là má»™t lần commit (chuyển giao)" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "không phải nhánh hiện hà nh" -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "Không có máy chủ cho nhánh hiện hà nh." -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "Không có dòng ngược mặc định được định nghÄ©a cho nhánh hiện hà nh." -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "Không nhánh mạng theo vết cho %s từ %s" -#: builtin/merge.c:1146 -#: builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "%s - không phải là má»™t số thứ chúng tôi có thể hòa trá»™n" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." -msgstr "Ở đây không có lần hòa trá»™n nà o được hủy bá» giữa chừng cả (không thấy MERGE_HEAD)." +msgstr "" +"Ở đây không có lần hòa trá»™n nà o được hủy bá» giữa chừng cả (thiếu MERGE_HEAD)." -#: builtin/merge.c:1230 -#: git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3965,12 +3976,11 @@ msgstr "" "Bạn chÆ°a kết thúc việc hòa trá»™ng (MERGE_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trÆ°á»›c khi bạn có thể hòa trá»™n." -#: builtin/merge.c:1233 -#: git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Bạn chÆ°a kết thúc việc hòa trá»™ng (MERGE_HEAD vẫn tồn tại)." -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3978,83 +3988,90 @@ msgstr "" "Bạn chÆ°a kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" "Hãy chuyển giao (commit) các thay đổi trÆ°á»›c khi bạn có thể hòa trá»™n." -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Bạn chÆ°a kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại)." -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." -msgstr "Bạn không thể tổ hợp --squash vá»›i --no-ff." +msgstr "Bạn không thể kết hợp --squash vá»›i --no-ff." -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." -msgstr "Bạn không thể tổ hợp --no-ff vá»›i --ff-only." +msgstr "Bạn không thể kết hợp --no-ff vá»›i --ff-only." -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." -msgstr "Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chÆ°a được đặt." +msgstr "" +"Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chÆ°a được " +"đặt." -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" -msgstr "Không thể hòa trá»™n má»™t cách đúng đắn má»™t lần chuyển giao (commit) và o má»™t head rá»—ng" +msgstr "" +"Không thể hòa trá»™n má»™t cách đúng đắn má»™t lần chuyển giao (commit) và o má»™t " +"head rá»—ng" -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "Squash commit và o má»™t head trống rá»—ng vẫn chÆ°a được há»— trợ" -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "Chuyển giao (commit) không-fast-forward không hợp lý ở trong má»™t head trống rá»—ng" +msgstr "" +"Chuyển giao (commit) không-fast-forward không hợp lý ở trong má»™t head trống " +"rá»—ng" -#: builtin/merge.c:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "Äang cáºp nháºt %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Äang thá» hòa trá»™n kiểu 'trivial in-index'...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "Thá»±c hiện lệnh fast-forward là không thể được, Ä‘ang bá» qua." -#: builtin/merge.c:1513 -#: builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Äang tua lại cây thà nh thá»i xa xÆ°a...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Äang thá» chiến lược hòa trá»™n %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Không có chiến lược hòa trá»™n nà o được nắm giữ (handle) sá»± hòa trá»™n.\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Hòa trá»™n vá»›i chiến lược %s gặp lá»—i.\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Sá» dụng %s để chuẩn bị giải quyết bằng tay.\n" -#: builtin/merge.c:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" -msgstr "Hòa trá»™n tá»± Ä‘á»™ng đã trở nên tốt; bị dừng trÆ°á»›c khi việc chuyển giao được yêu cầu\n" +msgstr "" +"Hòa trá»™n tá»± Ä‘á»™ng đã trở nên tốt; bị dừng trÆ°á»›c khi việc chuyển giao được yêu " +"cầu\n" #: builtin/mv.c:108 #, c-format @@ -4097,7 +4114,7 @@ msgstr "Ä‘ang ghi đè lên '%s'" #: builtin/mv.c:184 msgid "Cannot overwrite" -msgstr "Không thể ghi chèn" +msgstr "Không thể ghi đè" #: builtin/mv.c:187 msgid "multiple sources for the same target" @@ -4111,10 +4128,9 @@ msgstr "%s, nguồn=%s, Ä‘Ãch=%s" #: builtin/mv.c:212 #, c-format msgid "Renaming %s to %s\n" -msgstr "Äang thay đổi tên %s thà nh %s\n" +msgstr "Äổi tên %s thà nh %s\n" -#: builtin/mv.c:215 -#: builtin/remote.c:731 +#: builtin/mv.c:215 builtin/remote.c:731 #, c-format msgid "renaming '%s' failed" msgstr "đổi tên %s gặp lá»—i" @@ -4138,18 +4154,17 @@ msgstr "gặp lá»—i khi đóng Ä‘Æ°á»ng ống cho lệnh 'show' cho đối tÆ°á msgid "failed to finish 'show' for object '%s'" msgstr "gặp lá»—i khi hoà n thà nh 'show' cho đối tượng '%s'" -#: builtin/notes.c:175 -#: builtin/tag.c:347 +#: builtin/notes.c:175 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo táºp tin '%s'" #: builtin/notes.c:189 msgid "Please supply the note contents using either -m or -F option" -msgstr "Xin hãy áp dụng ná»™i dung của ghi chú sá» dụng hoặc là tùy chá»n -m hoặc là -F" +msgstr "" +"Xin hãy áp dụng ná»™i dung của ghi chú sá» dụng hoặc là tùy chá»n -m hoặc là -F" -#: builtin/notes.c:210 -#: builtin/notes.c:973 +#: builtin/notes.c:210 builtin/notes.c:973 #, c-format msgid "Removing note for object %s\n" msgstr "Äang gỡ bá» ghi chú (note) cho đối tượng %s\n" @@ -4163,30 +4178,20 @@ msgstr "không thể ghi đối tượng ghi chú (note)" msgid "The note contents has been left in %s" msgstr "Ná»™i dung ghi chú còn lại %s" -#: builtin/notes.c:251 -#: builtin/tag.c:542 +#: builtin/notes.c:251 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "không thể Ä‘á»c '%s'" -#: builtin/notes.c:253 -#: builtin/tag.c:545 +#: builtin/notes.c:253 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "không thể mở để Ä‘á»c hay ghi '%s'" -#: builtin/notes.c:272 -#: builtin/notes.c:445 -#: builtin/notes.c:447 -#: builtin/notes.c:507 -#: builtin/notes.c:561 -#: builtin/notes.c:644 -#: builtin/notes.c:649 -#: builtin/notes.c:724 -#: builtin/notes.c:766 -#: builtin/notes.c:968 -#: builtin/reset.c:293 -#: builtin/tag.c:558 +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Gặp lá»—i khi giải quyết '%s' nhÆ° là má»™t tham chiếu (ref) hợp lệ." @@ -4198,7 +4203,9 @@ msgstr "Gặp lá»—i khi Ä‘á»c đối tượng '%s'." #: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "Không thể chuyển giao (commit) chÆ°a được khởi tạo hoặc không được tham chiếu cây ghi chú" +msgstr "" +"Không thể chuyển giao (commit) chÆ°a được khởi tạo hoặc không được tham chiếu " +"cây ghi chú" #: builtin/notes.c:340 #, c-format @@ -4227,29 +4234,27 @@ msgstr "Dòng nháºp và o dị hình: '%s'." msgid "Failed to copy notes from '%s' to '%s'" msgstr "Gặp lá»—i khi sao chép ghi chú (note) từ '%s' tá»›i '%s'" -#: builtin/notes.c:500 -#: builtin/notes.c:554 -#: builtin/notes.c:627 -#: builtin/notes.c:639 -#: builtin/notes.c:712 -#: builtin/notes.c:759 +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 #: builtin/notes.c:1033 msgid "too many parameters" msgstr "quá nhiá»u đối số" -#: builtin/notes.c:513 -#: builtin/notes.c:772 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." -msgstr "không ghi chú được tìm thấy cho đối tượng %s." +msgstr "không tìm thấy ghi chú cho đối tượng %s." #: builtin/notes.c:580 #, c-format -msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" -msgstr "Không thể thêm các ghi chú. Äã tìm thấy các ghi chú đã sẵn có cho đối tượng %s. Sá» dụng tùy chá»n '-f' để ghi đè lên các ghi chú cÅ©" +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Không thể thêm các ghi chú. Äã tìm thấy các ghi chú đã 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:585 -#: builtin/notes.c:662 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Äang ghi đè lên ghi chú cÅ© cho đối tượng %s\n" @@ -4260,8 +4265,12 @@ msgstr "quá Ãt đối số" #: builtin/notes.c:656 #, c-format -msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" -msgstr "Không thể sao chép các ghi chú. Äã tìm thấy các ghi chú đã sẵn có cho đối tượng %s. Sá» dụng tùy chá»n '-f' để ghi đè lên các ghi chú cÅ©" +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Không thể sao chép các ghi chú. Äã tìm thấy các ghi chú đã 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:668 #, c-format @@ -4282,14 +4291,12 @@ msgstr "" msgid "Object %s has no note\n" msgstr "Äối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:1103 -#: builtin/remote.c:1598 +#: builtin/notes.c:1103 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" -#: builtin/pack-objects.c:183 -#: builtin/pack-objects.c:186 +#: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "lá»—i giải nén (%d)" @@ -4328,7 +4335,8 @@ msgid "" "To choose either option permanently, see push.default in 'git help config'." msgstr "" "\n" -"Äể chá»n má»—i tùy chá»n má»™t cách cố định, xem push.default trong 'git help config'." +"Äể chá»n má»—i tùy chá»n má»™t cách cố định, xem push.default trong 'git help " +"config'." #: builtin/push.c:102 #, c-format @@ -4379,7 +4387,8 @@ msgid "" " git push --set-upstream %s %s\n" msgstr "" "Nhánh hiện tại %s không có nhánh dòng ngược (upstream) nà o.\n" -"Äể push (đẩy lên) nhánh hiện tại và đặt máy chủ nhÆ° là dòng ngược (upstream), sá» dụng\n" +"Äể push (đẩy lên) nhánh hiện tại và đặt máy chủ nhÆ° là dòng ngược " +"(upstream), sá» dụng\n" "\n" " git push --set-upstream %s %s\n" @@ -4395,15 +4404,51 @@ msgid "" "your current branch '%s', without telling me what to push\n" "to update which remote branch." msgstr "" -"Bạn Ä‘ang push (đẩy lên) máy chủ '%s', mà nó không phải là dòng ngược (upstream) của\n" +"Bạn Ä‘ang push (đẩy lên) máy chủ '%s', mà nó không phải là dòng ngược " +"(upstream) của\n" "nhánh hiện tại '%s' của bạn, mà không báo cho tôi biết là cái gì được push\n" "để cáºp nháºt nhánh máy chủ nà o." -#: builtin/push.c:174 -msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"." -msgstr "Bạn đã không chỉ ra má»™t refspecs nà o để push, và push.default là \"không là gì cả\"." +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" +"push.default chÆ°a được đặt; giá trị ngầm định của nó đã được thay đổi trong\n" +"Git 2.0 từ 'matching' thà nh 'simple'. Äể chấm dứt lá»i nhắc nhở nà y\n" +"và duy trì cách xá» lý sau những thay đổi mặc định nà y, hãy chạy lệnh:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"Äể chấm dứt lá»i nhắc nhở nà y và sá» dụng cách xá» lý má»›i, hãy chạy lệnh:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"Xem 'git help config' và tìm đến 'push.default' để có thêm thông tin.\n" +"(chế Ä‘á»™ 'simple' được bắt đầu sá» dụng từ Git 1.7.11. Sá» dụng chế Ä‘á»™ tÆ°Æ¡ng " +"tá»±\n" +"'current' thay vì 'simple' nếu bạn thỉnh thoảng phải sá» dụng bản Git cÅ©)" -#: builtin/push.c:181 +#: builtin/push.c:199 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Bạn đã không chỉ ra má»™t refspecs nà o để push, và push.default là \"không là " +"gì cả\"." + +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4411,23 +4456,28 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cáºp nháºt bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bá»™\n" -"pháºn tÆ°Æ¡ng ứng của máy chủ. Hòa trá»™n vá»›i các thay đổi từ máy chủ (v.d. 'git pull')\n" +"pháºn tÆ°Æ¡ng ứng của máy chủ. Hòa trá»™n vá»›i các thay đổi từ máy chủ (v.d. 'git " +"pull')\n" "trÆ°á»›c khi lại push lần nữa.\n" -"Xem trong phần 'Note about fast-forwards' trong ná»™i dung từ lệnh 'git push --help'." +"Xem trong phần 'Note about fast-forwards' từ lệnh 'git push --help' để có " +"thông tin chi tiết." -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "Việc cáºp nháºt bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bá»™\n" -"pháºn tÆ°Æ¡ng ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có lẽ muốn\n" -"chỉ định các nhánh để push hoặt là đặt ná»™i dung cho biến cấu hình 'push.default'\n" -"thà nh 'current' hoặc 'upstream' để push chỉ nhánh hiện hà nh mà thôi." - -#: builtin/push.c:193 +"pháºn tÆ°Æ¡ng ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có lẽ " +"muốn\n" +"chỉ định các nhánh để push hoặt là đặt ná»™i dung cho biến cấu hình 'push." +"default'\n" +"thà nh 'simple', 'current' hoặc 'upstream' để chỉ push nhánh hiện hà nh mà " +"thôi." + +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4435,29 +4485,32 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" "Việc cáºp nháºt bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bá»™\n" -"pháºn tÆ°Æ¡ng ứng của máy chủ. Checkou nhánh nà y và hòa trá»™n vá»›i các thay đổi từ máy chủ\n" +"pháºn tÆ°Æ¡ng ứng của máy chủ. Checkou nhánh nà y và hòa trá»™n vá»›i các thay đổi " +"từ máy chủ\n" "(v.d. 'git pull') trÆ°á»›c khi lại push lần nữa.\n" -"Xem trong phần 'Note about fast-forwards' trong ná»™i dung từ lệnh 'git push --help'." +"Xem trong phần 'Note about fast-forwards' từ lệnh 'git push --help' để có " +"thông tin chi tiết." -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "Äang push (đẩy) lên %s\n" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "gặp lá»—i khi push (đẩy lên) má»™t số tham chiếu (ref) đến '%s'" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai '%s'" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote repository using\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" "\n" " git remote add <name> <url>\n" "\n" @@ -4474,31 +4527,31 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all không thể được tổ hợp cùng vá»›i refspecs" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror không thể được tổ hợp cùng vá»›i refspecs" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete là xung khắc vá»›i các tùy chá»n --all, --mirror và --tags" -#: builtin/push.c:387 +#: builtin/push.c:412 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" @@ -4522,20 +4575,18 @@ msgstr "không hiểu tham số máy bản sao (mirror): %s" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" -msgstr "Ä‘ang chỉ định má»™t nhánh master không phân biệt HOA/thÆ°á»ng vá»›i tùy chá»n --mirror" +msgstr "Ä‘ang chỉ định má»™t nhánh master không hợp lý vá»›i tùy chá»n --mirror" #: builtin/remote.c:187 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "chỉ định những nhánh để theo vết chỉ hợp lý vá»›i các 'fetch mirror'" -#: builtin/remote.c:195 -#: builtin/remote.c:646 +#: builtin/remote.c:195 builtin/remote.c:646 #, c-format msgid "remote %s already exists." msgstr "máy chủ %s đã tồn tại rồi." -#: builtin/remote.c:199 -#: builtin/remote.c:650 +#: builtin/remote.c:199 builtin/remote.c:650 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' không phải tên máy chủ hợp lệ" @@ -4555,8 +4606,7 @@ msgstr "nhiá»u hÆ¡n má»™t %s" msgid "Could not get fetch map for refspec %s" msgstr "Không thể lấy ánh xạ (map) fetch cho refspec %s" -#: builtin/remote.c:440 -#: builtin/remote.c:448 +#: builtin/remote.c:440 builtin/remote.c:448 msgid "(matching)" msgstr "(mẫu)" @@ -4564,16 +4614,12 @@ msgstr "(mẫu)" msgid "(delete)" msgstr "(xoá)" -#: builtin/remote.c:595 -#: builtin/remote.c:601 -#: builtin/remote.c:607 +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format msgid "Could not append '%s' to '%s'" msgstr "Không thể nối thêm '%s' và o '%s'" -#: builtin/remote.c:639 -#: builtin/remote.c:792 -#: builtin/remote.c:890 +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 #, c-format msgid "No such remote: %s" msgstr "Không có máy chủ nà o nhÆ° thế: %s" @@ -4583,8 +4629,7 @@ msgstr "Không có máy chủ nà o nhÆ° thế: %s" msgid "Could not rename config section '%s' to '%s'" msgstr "Không thể đổi tên chÆ°Æ¡ng (section) cấu hình từ '%s' thà nh '%s'" -#: builtin/remote.c:662 -#: builtin/remote.c:799 +#: builtin/remote.c:662 builtin/remote.c:799 #, c-format msgid "Could not remove config section '%s'" msgstr "Không thể gỡ bá» chÆ°Æ¡ng (section) cấu hình '%s'" @@ -4623,7 +4668,7 @@ msgstr "tạo %s gặp lá»—i" #: builtin/remote.c:764 #, c-format msgid "Could not remove branch %s" -msgstr "Không thể gỡ nhánh %s" +msgstr "Không thể gỡ bá» nhánh %s" #: builtin/remote.c:834 msgid "" @@ -4636,7 +4681,8 @@ msgstr[0] "" "Chú ý: Má»™t nhánh nằm ngoà i hệ thống refs/remotes/ đã không được gỡ bá» Ä‘i;\n" "để xóa Ä‘i, sá» dụng:" msgstr[1] "" -"Chú ý: Má»™t số nhánh nằm ngoà i hệ thống refs/remotes/ đã không được gỡ bá» Ä‘i;\n" +"Chú ý: Má»™t số nhánh nằm ngoà i hệ thống refs/remotes/ đã không được gỡ bá» " +"Ä‘i;\n" "để xóa Ä‘i, sá» dụng:" #: builtin/remote.c:943 @@ -4650,7 +4696,7 @@ msgstr " bị theo vết" #: builtin/remote.c:948 msgid " stale (use 'git remote prune' to remove)" -msgstr " cÅ© (sá» dụng 'git remote prune' để gỡ bá»)" +msgstr " cÅ© (dùng 'git remote prune' để gỡ bá»)" #: builtin/remote.c:950 msgid " ???" @@ -4678,7 +4724,7 @@ msgstr " và vá»›i máy chủ" #: builtin/remote.c:1004 #, c-format msgid "merges with remote %s" -msgstr "hòa trá»™n vá»›i máy chủ %s" +msgstr "hòa trá»™n vá»›i máy chủ %s" #: builtin/remote.c:1005 msgid " and with remote" @@ -4734,28 +4780,25 @@ msgstr "* máy chủ %s" msgid " Fetch URL: %s" msgstr " URL để lấy vá» (fetch): %s" -#: builtin/remote.c:1120 -#: builtin/remote.c:1285 +#: builtin/remote.c:1120 builtin/remote.c:1285 msgid "(no URL)" -msgstr "(không có URL nà o)" +msgstr "(không có URL)" -#: builtin/remote.c:1129 -#: builtin/remote.c:1131 +#: builtin/remote.c:1129 builtin/remote.c:1131 #, c-format msgid " Push URL: %s" -msgstr " URL để đẩy lên (push) : %s" +msgstr " URL để đẩy lên (push): %s" -#: builtin/remote.c:1133 -#: builtin/remote.c:1135 -#: builtin/remote.c:1137 +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 #, c-format msgid " HEAD branch: %s" msgstr " Nhánh HEAD: %s" #: builtin/remote.c:1139 #, c-format -msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" -msgstr " nhánh HEAD (HEAD máy chủ là không rõ rà ng, có lẽ là má»™t trong số sau):\n" +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " nhánh HEAD (HEAD máy chủ chÆ°a rõ rà ng, có lẽ là má»™t trong số sau):\n" #: builtin/remote.c:1151 #, c-format @@ -4764,8 +4807,7 @@ msgid_plural " Remote branches:%s" msgstr[0] " Nhánh trên máy chủ:%s" msgstr[1] " Những nhánh trên máy chủ:%s" -#: builtin/remote.c:1154 -#: builtin/remote.c:1181 +#: builtin/remote.c:1154 builtin/remote.c:1181 msgid " (status not queried)" msgstr " (trạng thái không được yêu cầu)" @@ -4812,12 +4854,12 @@ msgstr "Không thể cà i đặt %s" #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" -msgstr " %s sẽ trở thà nh lủng lẳng (không được quản lý)!" +msgstr " %s sẽ trở thà nh không đầu (không được quản lý)!" #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" -msgstr " %s phải trở thà nh lủng lẳng (không được quản lý)!" +msgstr " %s đã trở thà nh không đầu (không được quản lý)!" #: builtin/remote.c:1281 #, c-format @@ -4839,8 +4881,7 @@ msgstr " * [nên xén bá»›t] %s" msgid " * [pruned] %s" msgstr " *[đã xén bá»›] %s" -#: builtin/remote.c:1387 -#: builtin/remote.c:1461 +#: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format msgid "No such remote '%s'" msgstr "Không có máy chủ nà o có tên '%s'" @@ -4933,7 +4974,9 @@ msgstr "--patch xung khắc vá»›i --{hard,mixed,soft}" #: builtin/reset.c:317 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>'." +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 #, c-format @@ -4950,8 +4993,7 @@ msgstr "%s reset không được phép trên kho bare (trên máy chủ)" msgid "Could not reset index file to revision '%s'." msgstr "Không thể đặt lại (reset) bảng mục lục thà nh Ä‘iểm xét lại '%s'." -#: builtin/revert.c:70 -#: builtin/revert.c:92 +#: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s không thể được sá» dụng vá»›i %s" @@ -4975,7 +5017,7 @@ msgid "" "(use -f to force removal)" msgstr "" "'%s' có ná»™i dung được lÆ°u trạng thái khác biệt từ cả táºp tin và cả HEAD\n" -"(sá» dụng -f để ép buá»™c gỡ bá»)" +"(dùng tùy chá»n -f để ép buá»™c gỡ bá»)" #: builtin/rm.c:115 #, c-format @@ -4984,7 +5026,7 @@ msgid "" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' có các thay đổi được lÆ°u trạng thái trong bảng mục lục\n" -"(sá» dụng --cached để giữ táºp tin, hoặc -f để ép buá»™c gỡ bá»)" +"(dùng tùy chá»n --cached để giữ táºp tin, hoặc -f để ép buá»™c gỡ bá»)" #: builtin/rm.c:119 #, c-format @@ -4993,7 +5035,7 @@ msgid "" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' có các thay đổi ná»™i bá»™\n" -"(sá» dụng --cached để giữ táºp tin, hoặc -f để ép buá»™c gỡ bá»)" +"(dùng tùy chá»n --cached để giữ táºp tin, hoặc -f để ép buá»™c gỡ bá»)" #: builtin/rm.c:194 #, c-format @@ -5054,13 +5096,15 @@ msgid "" "\n" "#\n" "# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you want to.\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" "#\n" msgstr "" "\n" "#\n" "# Viết các ghi chú cho (thẻ) tag\n" -"# Những dòng được bắt đầu bằng '#' sẽ được bá» qua; bạn có thể xóa chúng Ä‘i nếu muốn.\n" +"# Những dòng được bắt đầu bằng '#' sẽ được bá» qua; bạn có thể xóa chúng Ä‘i " +"nếu muốn.\n" "#\n" #: builtin/tag.c:298 @@ -5148,10 +5192,10 @@ msgstr "Thẻ đã cáºp nháºt '%s' (cÅ© là %s)\n" #: git.c:16 msgid "See 'git help <command>' for more information on a specific command." -msgstr "Chạy lệnh 'git help <tên-lệnh>' để có thêm thông tin vá» lệnh được chỉ ra." +msgstr "" +"Chạy lệnh 'git help <tên-lệnh>' để có thêm thông tin vá» lệnh được chỉ ra." -#: parse-options.h:133 -#: parse-options.h:235 +#: parse-options.h:133 parse-options.h:235 msgid "n" msgstr "n" @@ -5209,7 +5253,9 @@ msgstr "Ghi các thay đổi và o kho chứa" #: common-cmds.h:14 msgid "Show changes between commits, commit and working tree, etc" -msgstr "Hiển thị các thay đổi giữa những lần chuyển giao (commit), commit và cây là m việc, v.v.." +msgstr "" +"Hiển thị các thay đổi giữa những lần chuyển giao (commit), commit và cây là m " +"việc, v.v.." #: common-cmds.h:15 msgid "Download objects and refs from another repository" @@ -5221,7 +5267,8 @@ msgstr "In ra những dòng khá»›p vá»›i má»™t mẫu" #: common-cmds.h:17 msgid "Create an empty git repository or reinitialize an existing one" -msgstr "Tạo má»™t kho git trống rá»—ng hay khởi tạo lại má»™t kho đã tồn tại từ trÆ°á»›c" +msgstr "" +"Tạo má»™t kho git trống rá»—ng hay khởi tạo lại má»™t kho đã tồn tại từ trÆ°á»›c" #: common-cmds.h:18 msgid "Show commit logs" @@ -5229,7 +5276,9 @@ msgstr "hiển thị nháºt ký các lần commit (chuyển giao)" #: common-cmds.h:19 msgid "Join two or more development histories together" -msgstr "Hợp nhất hai hay nhiá»u hÆ¡n lịch sá» của các nhà phát triển phần má»m lại vá»›i nhau" +msgstr "" +"Hợp nhất hai hay nhiá»u hÆ¡n lịch sá» của các nhà phát triển phần má»m lại vá»›i " +"nhau" #: common-cmds.h:20 msgid "Move or rename a file, a directory, or a symlink" @@ -5241,11 +5290,13 @@ msgstr "Fetch (lấy vá») và hòa trá»™ng vá»›i kho khác hay nhánh ná»™i bá» #: common-cmds.h:22 msgid "Update remote refs along with associated objects" -msgstr "Cáºp nháºt tham chiếu (refs) máy chủ cùng vá»›i các đối tượng liên quan đến nó" +msgstr "" +"Cáºp nháºt tham chiếu (refs) máy chủ cùng vá»›i các đối tượng liên quan đến nó" #: common-cmds.h:23 msgid "Forward-port local commits to the updated upstream head" -msgstr "Forward-port những lần chuyển giao ná»™i bá»™ tá»›i head dòng ngược đã cáºp nháºt" +msgstr "" +"Forward-port những lần chuyển giao ná»™i bá»™ tá»›i head dòng ngược đã cáºp nháºt" #: common-cmds.h:24 msgid "Reset current HEAD to the specified state" @@ -5265,7 +5316,9 @@ msgstr "Hiển thị trạng thái cây là m việc" #: common-cmds.h:28 msgid "Create, list, delete or verify a tag object signed with GPG" -msgstr "Tạo, liệt kê, xóa hay xác thá»±c má»™t đối tượng thẻ (tag) mà nó được ký sá» dụng GPG" +msgstr "" +"Tạo, liệt kê, xóa hay xác thá»±c má»™t đối tượng thẻ (tag) mà nó được ký sá» dụng " +"GPG" #: git-am.sh:50 msgid "You need to set your committer info first" @@ -5287,8 +5340,10 @@ msgid "" "To restore the original branch and stop patching, run \"$cmdline --abort\"." msgstr "" "Khi bạn cần giải quyết vấn Ä‘á» nà y hãy chạy lệnh \"$cmdline --resolved\".\n" -"Nếu bạn có ý định bá» qua miếng vá, thay và o đó bạn chạy \"$cmdline --skip\".\n" -"Äể phục hồi lại thà nh nhánh nguyên thủy và dừng việc vá lại thì chạy \"$cmdline --abort\"." +"Nếu bạn có ý định bá» qua miếng vá, thay và o đó bạn chạy \"$cmdline --skip" +"\".\n" +"Äể phục hồi lại thà nh nhánh nguyên thủy và dừng việc vá lại thì chạy " +"\"$cmdline --abort\"." #: git-am.sh:121 msgid "Cannot fall back to three-way merge." @@ -5300,7 +5355,8 @@ msgstr "Kho thiếu đối tượng blob cần thiết để trở vá» trên '3 #: git-am.sh:139 msgid "Using index info to reconstruct a base tree..." -msgstr "Sá» dụng thông tin trong bảng mục lục để cấu trúc lại má»™t cây (tree) cÆ¡ sở..." +msgstr "" +"Sá» dụng thông tin trong bảng mục lục để cấu trúc lại má»™t cây (tree) cÆ¡ sở..." #: git-am.sh:154 msgid "" @@ -5350,7 +5406,8 @@ 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 Ä‘ang được tiến hà nh, chúng ta không phục hồi lại." #: git-am.sh:575 #, sh-format @@ -5365,8 +5422,10 @@ msgid "" "To restore the original branch and stop patching run \"$cmdline --abort\"." msgstr "" "Miếng vá trống rá»—ng. Nó đã bị chia cắt sai phải không?\n" -"Nếu bạn thÃch bá» qua miếng vá nà y, hãy chạy lệnh sau để thay thế \"$cmdline --skip\".\n" -"Äể phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline --abort\"." +"Nếu bạn thÃch bá» qua miếng vá nà y, hãy chạy lệnh sau để thay thế \"$cmdline " +"--skip\".\n" +"Äể phục hồi lại nhánh nguyên thủy và dừng vá lại hãy chạy lệnh \"$cmdline --" +"abort\"." #: git-am.sh:706 msgid "Patch does not have a valid e-mail address." @@ -5374,7 +5433,8 @@ msgstr "Miếng vá không có địa chỉ e-mail hợp lệ." #: git-am.sh:753 msgid "cannot be interactive without stdin connected to a terminal." -msgstr "không thể được tÆ°Æ¡ng tác mà không có stdin kết nối vá»›i má»™t thiết bị cuối" +msgstr "" +"không thể được tÆ°Æ¡ng tác mà không có stdin kết nối vá»›i má»™t thiết bị cuối" #: git-am.sh:757 msgid "Commit Body is:" @@ -5385,7 +5445,9 @@ msgstr "Thân của lần chuyển giao (commit) là :" #. input at this point. #: git-am.sh:764 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -msgstr "Ãp dụng? đồng ý [y]/không [n]/chỉnh sá»a [e]/hiển thị miếng [v]á/đồng ý tất cả [a]" +msgstr "" +"Ãp dụng? đồng ý [y]/không [n]/chỉnh sá»a [e]/hiển thị miếng [v]á/đồng ý tất " +"cả [a] " #: git-am.sh:800 #, sh-format @@ -5400,7 +5462,8 @@ msgid "" msgstr "" "Không có thay đổi nà o - bạn đã quên sá» dụng lệnh 'git add' à ?\n" "Nếu ở đây không có gì còn lại stage, tình cá» là có má»™t số thứ khác\n" -"đã sẵn được Ä‘Æ°a và o vá»›i cùng ná»™i dung thay đổi; bạn có lẽ muốn bá» qua miếng vá nà y." +"đã sẵn được Ä‘Æ°a và o vá»›i cùng ná»™i dung thay đổi; bạn có lẽ muốn bá» qua miếng " +"vá nà y." #: git-am.sh:829 msgid "" @@ -5450,8 +5513,11 @@ msgstr "HEAD sai - Tôi cần má»™t HEAD" #: git-bisect.sh:130 #, sh-format -msgid "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." -msgstr "Việc checkout '$start_head' gặp lá»—i. Hãy thá» 'git bisect reset <nhánh_hợp_lệ>'." +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Việc checkout '$start_head' gặp lá»—i. Hãy thá» 'git bisect reset " +"<nhánh_hợp_lệ>'." #: git-bisect.sh:140 msgid "won't bisect on seeked tree" @@ -5488,14 +5554,15 @@ msgstr "'git bisect bad' có thể lấy chỉ má»™t đối số." #. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." -msgstr "Cảnh báo: chỉ thá»±c hiện việc bisect vá»›i má»™t lần chuyển giao (commit) sai." +msgstr "" +"Cảnh báo: chỉ thá»±c hiện việc bisect vá»›i má»™t lần chuyển giao (commit) sai." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. #: git-bisect.sh:279 msgid "Are you sure [Y/n]? " -msgstr "Bạn có chắc chắn chÆ°a [Y/n]?" +msgstr "Bạn có chắc chắn chÆ°a [Y/n]? " #: git-bisect.sh:289 msgid "" @@ -5512,11 +5579,11 @@ msgid "" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n" -"Bạn sau đó cần phải chỉ cho tôi Ãt nhất má»™t Ä‘iểm xét duyệt đúng và má»™t Ä‘iểm sai.\n" +"Bạn sau đó cần phải chỉ cho tôi Ãt nhất má»™t Ä‘iểm xét duyệt đúng và má»™t Ä‘iểm " +"sai.\n" "(Bạn có thể sá» dụng \"git bisect bad\" và \"git bisect good\" cho chúng.)" -#: git-bisect.sh:347 -#: git-bisect.sh:474 +#: git-bisect.sh:347 git-bisect.sh:474 msgid "We are not bisecting." msgstr "Chúng tôi không bisect." @@ -5586,15 +5653,19 @@ msgid "" msgstr "" "Pull là không thể được bởi vì bạn có những táºp tin chÆ°a được hòa trá»™n.\n" "Xin hãy sá»a chữa chúng trÆ°á»›c, và sau đó sá» dụng lệnh 'git add/rm <táºp-tin>'\n" -"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sá» dụng 'git commit -a'." +"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sá» dụng 'git " +"commit -a'." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." -msgstr "Full là không thể thá»±c hiện bởi vì bạn có những táºp tin chÆ°a được hòa trá»™n." +msgstr "" +"Full là không thể thá»±c hiện bởi vì bạn có những táºp tin chÆ°a được hòa trá»™n." #: git-pull.sh:197 msgid "updating an unborn branch with changes added to the index" -msgstr "Ä‘ang cáºp nháºt má»™t nhánh chÆ°a được sinh ra vá»›i các thay đổi được thêm và o bảng mục lục" +msgstr "" +"Ä‘ang cáºp nháºt má»™t nhánh chÆ°a được sinh ra vá»›i các thay đổi được thêm và o " +"bảng mục lục" #. The fetch involved updating the current branch. #. The working tree and the index file is still based on the @@ -5623,11 +5694,14 @@ msgstr "Không thể thá»±c hiện lệnh rebase (cÆ¡ cấu lại) trên nhiá»u msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" -"To check out the original branch and stop rebasing, run \"git rebase --abort\"." +"To check out the original branch and stop rebasing, run \"git rebase --abort" +"\"." msgstr "" "Khi bạn cần giải quyết vấn Ä‘á» nà y hãy chạy lệnh \"git rebase --continue\".\n" -"Nếu bạn có ý định bá» qua miếng vá, thay và o đó bạn chạy \"git rebase --skip\".\n" -"Äể phục hồi lại thà nh nhánh nguyên thủy và dừng việc vá lại thì chạy \"git rebase --abort\"." +"Nếu bạn có ý định bá» qua miếng vá, thay và o đó bạn chạy \"git rebase --skip" +"\".\n" +"Äể phục hồi lại thà nh nhánh nguyên thủy và dừng việc vá lại thì chạy \"git " +"rebase --abort\"." #: git-rebase.sh:159 msgid "The pre-rebase hook refused to rebase." @@ -5635,7 +5709,9 @@ msgstr "hook (chÆ°Æ¡ng trình móc và o git) pre-rebase từ chối rebase." #: git-rebase.sh:164 msgid "It looks like git-am is in progress. Cannot rebase." -msgstr "Hình nhÆ° Ä‘ang trong quá trình thá»±c hiện lệnh git-am. Không thể chạy lệnh rebase." +msgstr "" +"Hình nhÆ° Ä‘ang trong quá trình thá»±c hiện lệnh git-am. Không thể chạy lệnh " +"rebase." #: git-rebase.sh:295 msgid "The --exec option must be used with the --interactive option" @@ -5643,7 +5719,7 @@ msgstr "Tùy chá»n --exec phải được sá» dụng cùng vá»›i tùy chá»n - #: git-rebase.sh:300 msgid "No rebase in progress?" -msgstr "Không phải Ä‘ang rebase?" +msgstr "Không có tiến trình rebase nà o phải không?" #: git-rebase.sh:313 msgid "Cannot read HEAD" @@ -5693,10 +5769,9 @@ msgstr "dòng ngược không hợp lệ $upstream_name" #: git-rebase.sh:419 #, sh-format msgid "$onto_name: there are more than one merge bases" -msgstr "$onto_name: ở đây có nhiá»u hÆ¡n má»™t " +msgstr "$onto_name: ở đây có nhiá»u hÆ¡n má»™t" -#: git-rebase.sh:422 -#: git-rebase.sh:426 +#: git-rebase.sh:422 git-rebase.sh:426 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: ở đây không có gì để hòa trá»™n" @@ -5733,7 +5808,8 @@ msgstr "Thay đổi từ $mb thà nh $onto:" #. Detach HEAD and reset the tree #: git-rebase.sh:515 msgid "First, rewinding head to replay your work on top of it..." -msgstr "TrÆ°á»›c tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." +msgstr "" +"TrÆ°á»›c tiên, di chuyển head để xem lại các công việc trên đỉnh của nó..." #: git-rebase.sh:523 #, sh-format @@ -5742,7 +5818,8 @@ msgstr "Fast-forward $branch_name thà nh $onto_name." #: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" -msgstr "git stash clear vá»›i các tham số là chÆ°a được thá»±c hiện (không nháºn đối số)" +msgstr "" +"git stash clear vá»›i các tham số là chÆ°a được thá»±c hiện (không nháºn đối số)" #: git-stash.sh:74 msgid "You do not have the initial commit yet" @@ -5752,8 +5829,7 @@ msgstr "Bạn chÆ°a còn có lần chuyển giao (commit) khởi tạo" msgid "Cannot save the current index state" msgstr "Không thể ghi lại trạng thái bảng mục lục hiện hà nh" -#: git-stash.sh:123 -#: git-stash.sh:136 +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" msgstr "Không thể ghi lại trạng thái cây-là m-việc hiện hà nh" @@ -5806,7 +5882,7 @@ msgstr "Không thể gỡ bá» các thay đổi cây-là m-việc" #: git-stash.sh:352 msgid "No stash found." -msgstr "Không tìm thấy stast nà o." +msgstr "Không tìm thấy stash nà o." #: git-stash.sh:359 #, sh-format @@ -5875,98 +5951,105 @@ msgstr "(Äể phục hồi lại chúng hãy gõ \"git stash apply\")" msgid "cannot strip one component off url '$remoteurl'" msgstr "không thể tháo bá» má»™t thà nh phần ra khá»i url '$remoteurl'" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, 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'" +msgstr "" +"Không tìm thấy ánh xạ (mapping) mô-Ä‘un-con trong .gitmodules cho Ä‘Æ°á»ng dẫn " +"'$sm_path'" -#: git-submodule.sh:189 +#: git-submodule.sh:211 #, 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:201 +#: git-submodule.sh:223 #, 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\"" +msgstr "" +"Gitdir '$a' là bá»™ pháºn của Ä‘Æ°á»ng dẫn mô-Ä‘un-con '$b' hoặc \"vice versa\"" -#: git-submodule.sh:290 +#: git-submodule.sh:312 #, 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 ./|../" +msgstr "" +"repo URL: '$repo' phải là đưá»ng dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" -#: git-submodule.sh:307 +#: git-submodule.sh:329 #, 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:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" "$sm_path\n" "Use -f if you really want to add it." msgstr "" -"Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các táºp tin .gitignore của bạn:\n" +"Các Ä‘Æ°á»ng dẫn theo sau đây sẽ bị lá» Ä‘i bởi má»™t trong các táºp tin .gitignore " +"của bạn:\n" "$sm_path\n" "Sá» dụng -f nếu bạn thá»±c sá»± muốn thêm nó và o." -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, 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:324 +#: git-submodule.sh:346 #, 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:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể checkout mô-Ä‘un con '$sm_path'" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, 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:348 +#: git-submodule.sh:370 #, 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:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Äang nháºp '$prefix$sm_path'" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, 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:447 +#: git-submodule.sh:471 #, 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" +msgstr "" +"Không tìm thấy url cho Ä‘Æ°á»ng dẫn mô-Ä‘un-con '$sm_path' trong .gitmodules" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, 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:458 +#: git-submodule.sh:482 #, 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:466 +#: git-submodule.sh:490 #, 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'" +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:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5975,94 +6058,106 @@ 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:578 +#: git-submodule.sh:603 #, 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'" +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:597 +#: git-submodule.sh:622 #, 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:611 +#: git-submodule.sh:636 #, 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:612 +#: git-submodule.sh:637 #, 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:617 +#: git-submodule.sh:642 #, 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'" +msgstr "" +"Không thể hòa trá»™n (merge) '$sha1' trong Ä‘Æ°á»ng dẫn mô-Ä‘un-con '$sm_path'" -#: git-submodule.sh:618 +#: git-submodule.sh:643 #, 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:623 +#: git-submodule.sh:648 #, 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:624 +#: git-submodule.sh:649 #, 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:646 -#: git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, 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:754 +#: git-submodule.sh:779 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:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế Ä‘á»™ không nhÆ° mong chá» $mod_dst" -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, 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:815 +#: git-submodule.sh:840 #, 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:818 +#: git-submodule.sh:843 #, 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" +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:843 +#: git-submodule.sh:868 msgid "blob" msgstr "blob" -#: git-submodule.sh:881 +#: git-submodule.sh:906 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:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "# Những thay đổi mô-Ä‘un-con được chuyển giao (commit):" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Äang đồng bá»™ hóa url mô-Ä‘un-con cho '$name'" +#~ msgid "diff setup failed" +#~ msgstr "cà i đặt diff gặp lá»—i" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive: Ä‘Ä©a bị đầy?" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done gặp lá»—i" + #~ msgid "-d option is no longer supported. Do not use." #~ msgstr "Tùy chá»n -d không còn được há»— trợ nữa. Xin đừng sá» dụng." diff --git a/po/zh_CN.po b/po/zh_CN.po index bc04236e47..c9331e9555 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -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-08-06 23:47+0800\n" -"PO-Revision-Date: 2012-08-07 01:07+0800\n" +"POT-Creation-Date: 2012-09-05 06:20+0800\n" +"PO-Revision-Date: 2012-09-07 17:56+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -62,7 +62,7 @@ msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的æ交：" #: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290 -#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347 +#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "版本é历设置失败" @@ -89,7 +89,7 @@ msgstr[1] "è¿™ä¸ªåŒ…éœ€è¦ %d 个这些引用" msgid "rev-list died" msgstr "rev-list 终æ¢" -#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的å‚数：%s" @@ -236,32 +236,32 @@ msgstr "" "å‘现é…ç½®å˜é‡ 'diff.dirstat' ä¸çš„错误：\n" "%s" -#: diff.c:1400 +#: diff.c:1401 msgid " 0 files changed" msgstr " 0 个文件被修改" -#: diff.c:1404 +#: diff.c:1405 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" msgstr[1] " %d 个文件被修改" -#: diff.c:1421 +#: diff.c:1422 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "，æ’å…¥ %d è¡Œ(+)" msgstr[1] "，æ’å…¥ %d è¡Œ(+)" -#: diff.c:1432 +#: diff.c:1433 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "ï¼Œåˆ é™¤ %d è¡Œ(-)" msgstr[1] "ï¼Œåˆ é™¤ %d è¡Œ(-)" -#: diff.c:3461 +#: diff.c:3460 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -366,74 +366,66 @@ msgstr "为路径 '%s' addinfo_cache 失败" msgid "error building trees" msgstr "æ— æ³•åˆ›å»ºæ ‘" -#: merge-recursive.c:497 -msgid "diff setup failed" -msgstr "diff 设置失败" - -#: merge-recursive.c:627 -msgid "merge-recursive: disk full?" -msgstr "merge-recursive：ç£ç›˜å·²æ»¡ï¼Ÿ" - -#: merge-recursive.c:690 +#: merge-recursive.c:672 #, c-format msgid "failed to create path '%s'%s" msgstr "æ— æ³•åˆ›å»ºè·¯å¾„ '%s'%s" -#: merge-recursive.c:701 +#: merge-recursive.c:683 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "åˆ é™¤ %s 以便为å目录留出空间\n" #. something else exists #. .. but not some other error (who really cares what?) -#: merge-recursive.c:715 merge-recursive.c:736 +#: merge-recursive.c:697 merge-recursive.c:718 msgid ": perhaps a D/F conflict?" msgstr "：å¯èƒ½æ˜¯ä¸€ä¸ªç›®å½•/文件冲çªï¼Ÿ" -#: merge-recursive.c:726 +#: merge-recursive.c:708 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "æ‹’ç»ä¸¢å¼ƒ '%s' ä¸çš„未跟踪文件" -#: merge-recursive.c:766 +#: merge-recursive.c:748 #, c-format msgid "cannot read object %s '%s'" msgstr "ä¸èƒ½è¯»å–对象 %s '%s'" -#: merge-recursive.c:768 +#: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" msgstr "%s '%s' 应为二进制对象（blob）" -#: merge-recursive.c:791 builtin/clone.c:302 +#: merge-recursive.c:773 builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "æ— æ³•æ‰“å¼€ '%s'" -#: merge-recursive.c:799 +#: merge-recursive.c:781 #, c-format msgid "failed to symlink '%s'" msgstr "æ— æ³•åˆ›å»ºç¬¦å·é“¾æŽ¥ '%s'" -#: merge-recursive.c:802 +#: merge-recursive.c:784 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "ä¸çŸ¥é“å¦‚ä½•å¤„ç† %06o %s '%s'" -#: merge-recursive.c:939 +#: merge-recursive.c:921 msgid "Failed to execute internal merge" msgstr "æ— æ³•æ‰§è¡Œå†…éƒ¨åˆå¹¶" -#: merge-recursive.c:943 +#: merge-recursive.c:925 #, c-format msgid "Unable to add %s to database" msgstr "ä¸èƒ½æ·»åŠ %s 至对象库" -#: merge-recursive.c:959 +#: merge-recursive.c:941 msgid "unsupported object type in the tree" msgstr "åœ¨æ ‘ä¸æœ‰ä¸æ”¯æŒçš„对象类型" -#: merge-recursive.c:1038 merge-recursive.c:1052 +#: merge-recursive.c:1020 merge-recursive.c:1034 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -442,7 +434,7 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %5$s ä¸è¢« %4$s。%7$s 在 %6$s ä¸" "的版本被ä¿ç•™ã€‚" -#: merge-recursive.c:1044 merge-recursive.c:1057 +#: merge-recursive.c:1026 merge-recursive.c:1039 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -451,20 +443,20 @@ msgstr "" "冲çªï¼ˆ%1$s/åˆ é™¤ï¼‰ï¼š%2$s 在 %3$s ä¸è¢«åˆ 除，在 %5$s ä¸è¢« %4$s。%7$s 在 %6$s ä¸" "的版本ä¿ç•™äºŽ %8$s ä¸ã€‚" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "rename" msgstr "é‡å‘½å" -#: merge-recursive.c:1098 +#: merge-recursive.c:1080 msgid "renamed" msgstr "é‡å‘½å" -#: merge-recursive.c:1154 +#: merge-recursive.c:1136 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s 是 %s ä¸çš„一个目录而以 %s 为åè¢«æ·»åŠ " -#: merge-recursive.c:1176 +#: merge-recursive.c:1158 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -473,144 +465,144 @@ msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å）：在分支 \"%3$s\" ä¸é‡å‘½å \"%1$s\"->\"%2$s\"，在分支 " "\"%6$s\" ä¸é‡å‘½å \"%4$s\"->\"%5$s\"%7$s" -#: merge-recursive.c:1181 +#: merge-recursive.c:1163 msgid " (left unresolved)" msgstr "（留下未解决）" -#: merge-recursive.c:1235 +#: merge-recursive.c:1217 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "冲çªï¼ˆé‡å‘½å/é‡å‘½å）：在 %3$s ä¸é‡å‘½å %1$s->%2$s，在 %6$s ä¸é‡å‘½å %4$s->" "%5$s" -#: merge-recursive.c:1265 +#: merge-recursive.c:1247 #, c-format msgid "Renaming %s to %s and %s to %s instead" msgstr "而是é‡å‘½å %s 至 %s ä»¥åŠ %s 至 %s" -#: merge-recursive.c:1464 +#: merge-recursive.c:1446 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "冲çªï¼ˆé‡å‘½å/æ·»åŠ ï¼‰ï¼šåœ¨ %3$s ä¸é‡å‘½å %1$s->%2$s。在 %5$s ä¸æ·»åŠ %4$s" -#: merge-recursive.c:1474 +#: merge-recursive.c:1456 #, c-format msgid "Adding merged %s" msgstr "æ·»åŠ åˆå¹¶åŽçš„ %s" -#: merge-recursive.c:1479 merge-recursive.c:1677 +#: merge-recursive.c:1461 merge-recursive.c:1659 #, c-format msgid "Adding as %s instead" msgstr "而是以 %s 为åæ·»åŠ " -#: merge-recursive.c:1530 +#: merge-recursive.c:1512 #, c-format msgid "cannot read object %s" msgstr "ä¸èƒ½è¯»å–对象 %s" -#: merge-recursive.c:1533 +#: merge-recursive.c:1515 #, c-format msgid "object %s is not a blob" msgstr "对象 %s ä¸æ˜¯ä¸€ä¸ªäºŒè¿›åˆ¶å¯¹è±¡ï¼ˆblob）" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modify" msgstr "修改" -#: merge-recursive.c:1581 +#: merge-recursive.c:1563 msgid "modified" msgstr "修改" -#: merge-recursive.c:1591 +#: merge-recursive.c:1573 msgid "content" msgstr "内容" -#: merge-recursive.c:1598 +#: merge-recursive.c:1580 msgid "add/add" msgstr "æ·»åŠ /æ·»åŠ " -#: merge-recursive.c:1632 +#: merge-recursive.c:1614 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "略过 %s（已ç»åšè¿‡ç›¸åŒåˆå¹¶ï¼‰" -#: merge-recursive.c:1646 +#: merge-recursive.c:1628 #, c-format msgid "Auto-merging %s" msgstr "自动åˆå¹¶ %s" -#: merge-recursive.c:1650 git-submodule.sh:844 +#: merge-recursive.c:1632 git-submodule.sh:869 msgid "submodule" msgstr "å模组" -#: merge-recursive.c:1651 +#: merge-recursive.c:1633 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "冲çªï¼ˆ%s）：åˆå¹¶å†²çªäºŽ %s" -#: merge-recursive.c:1741 +#: merge-recursive.c:1723 #, c-format msgid "Removing %s" msgstr "åˆ é™¤ %s" -#: merge-recursive.c:1766 +#: merge-recursive.c:1748 msgid "file/directory" msgstr "文件/目录" -#: merge-recursive.c:1772 +#: merge-recursive.c:1754 msgid "directory/file" msgstr "目录/文件" -#: merge-recursive.c:1777 +#: merge-recursive.c:1759 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "冲çªï¼ˆ%1$s）：在 %3$s ä¸æœ‰ä¸€ä¸ªå为 %2$s 的目录。以 %5$s 为åæ·»åŠ %4$s" -#: merge-recursive.c:1787 +#: merge-recursive.c:1769 #, c-format msgid "Adding %s" msgstr "æ·»åŠ %s" -#: merge-recursive.c:1804 +#: merge-recursive.c:1786 msgid "Fatal merge failure, shouldn't happen." msgstr "严é‡çš„åˆå¹¶é”™è¯¯ï¼Œä¸åº”å‘生。" -#: merge-recursive.c:1823 +#: merge-recursive.c:1805 msgid "Already up-to-date!" msgstr "å·²ç»æ˜¯æœ€æ–°çš„ï¼" -#: merge-recursive.c:1832 +#: merge-recursive.c:1814 #, c-format msgid "merging of trees %s and %s failed" msgstr "æ— æ³•åˆå¹¶æ ‘ %s å’Œ %s" -#: merge-recursive.c:1862 +#: merge-recursive.c:1844 #, c-format msgid "Unprocessed path??? %s" msgstr "未处ç†çš„路径??? %s" -#: merge-recursive.c:1907 +#: merge-recursive.c:1889 msgid "Merging:" msgstr "åˆå¹¶ï¼š" -#: merge-recursive.c:1920 +#: merge-recursive.c:1902 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "å‘现 %u 个共åŒç¥–先：" msgstr[1] "å‘现 %u 个共åŒç¥–先：" -#: merge-recursive.c:1957 +#: merge-recursive.c:1939 msgid "merge returned no commit" msgstr "åˆå¹¶æœªè¿”回æ交" -#: merge-recursive.c:2014 +#: merge-recursive.c:1996 #, c-format msgid "Could not parse object '%s'" msgstr "ä¸èƒ½è§£æžå¯¹è±¡ '%s'" -#: merge-recursive.c:2026 builtin/merge.c:697 +#: merge-recursive.c:2008 builtin/merge.c:696 msgid "Unable to write index." msgstr "ä¸èƒ½å†™å…¥ç´¢å¼•ã€‚" @@ -666,14 +658,14 @@ msgstr[1] "" "您的分支和 '%s' 出现了å离，\n" "并且å„自分别有 %d å’Œ %d 处ä¸åŒçš„æ交。\n" -#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 -#: builtin/merge.c:1088 builtin/merge.c:1098 +#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 +#: builtin/merge.c:1087 builtin/merge.c:1097 #, c-format msgid "Could not open '%s' for writing" msgstr "ä¸èƒ½ä¸ºå†™å…¥æ‰“å¼€ '%s'" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 -#: builtin/merge.c:1090 builtin/merge.c:1103 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 +#: builtin/merge.c:1089 builtin/merge.c:1102 #, c-format msgid "Could not write to '%s'" msgstr "ä¸èƒ½å†™å…¥ '%s'" @@ -874,7 +866,7 @@ msgstr "ä¸èƒ½è§£æž HEAD" msgid "cannot abort from a branch yet to be born" msgstr "ä¸èƒ½ä»Žå°šæœªå»ºç«‹çš„分支终æ¢" -#: sequencer.c:805 builtin/apply.c:3988 +#: sequencer.c:805 builtin/apply.c:3987 #, c-format msgid "cannot open %s: %s" msgstr "ä¸èƒ½æ‰“å¼€ %s：%s" @@ -1309,6 +1301,11 @@ msgstr "领先 " msgid ", behind " msgstr "，è½åŽ " +#: compat/precompose_utf8.c:58 builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "æ— æ³•åˆ é™¤ '%s'" + #: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" @@ -1409,7 +1406,7 @@ msgstr "也许您想è¦æ‰§è¡Œ 'git add .'？\n" msgid "index file corrupt" msgstr "索引文件æŸå" -#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:480 builtin/apply.c:4432 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "æ— æ³•å†™å…¥æ–°ç´¢å¼•æ–‡ä»¶" @@ -1427,52 +1424,52 @@ msgstr "未能识别的空白å—符选项 '%s'" msgid "unrecognized whitespace ignore option '%s'" msgstr "未能识别的空白å—符忽略选项 '%s'" -#: builtin/apply.c:824 +#: builtin/apply.c:823 #, c-format msgid "Cannot prepare timestamp regexp %s" msgstr "æ— æ³•å‡†å¤‡æ—¶é—´æˆ³æ£åˆ™è¡¨è¾¾å¼ %s" -#: builtin/apply.c:833 +#: builtin/apply.c:832 #, c-format msgid "regexec returned %d for input: %s" msgstr "regexec 返回 %d，输入为：%s" -#: builtin/apply.c:914 +#: builtin/apply.c:913 #, c-format msgid "unable to find filename in patch at line %d" msgstr "ä¸èƒ½åœ¨è¡¥ä¸çš„第 %d 行找到文件å" -#: builtin/apply.c:946 +#: builtin/apply.c:945 #, c-format msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" msgstr "git apply：错误的 git-diff - 期望 /dev/null，但在第 %2$d 行得到 %1$s" -#: builtin/apply.c:950 +#: builtin/apply.c:949 #, c-format msgid "git apply: bad git-diff - inconsistent new filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上新文件åä¸ä¸€è‡´" -#: builtin/apply.c:951 +#: builtin/apply.c:950 #, c-format msgid "git apply: bad git-diff - inconsistent old filename on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件åä¸ä¸€è‡´" -#: builtin/apply.c:958 +#: builtin/apply.c:957 #, c-format msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d è¡Œ" -#: builtin/apply.c:1403 +#: builtin/apply.c:1402 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：æ„外的行：%.*s" -#: builtin/apply.c:1460 +#: builtin/apply.c:1459 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补ä¸ç‰‡æ®µæ²¡æœ‰å¤´ä¿¡æ¯ï¼š%.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1476 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1483,82 +1480,82 @@ msgid_plural "" msgstr[0] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" msgstr[1] "当移除 %d 个å‰å¯¼è·¯å¾„åŽ git diff 头缺ä¹æ–‡ä»¶åä¿¡æ¯ï¼ˆç¬¬ %d 行）" -#: builtin/apply.c:1637 +#: builtin/apply.c:1636 msgid "new file depends on old contents" msgstr "新文件ä¾èµ–旧内容" -#: builtin/apply.c:1639 +#: builtin/apply.c:1638 msgid "deleted file still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ä»æœ‰å†…容" -#: builtin/apply.c:1665 +#: builtin/apply.c:1664 #, c-format msgid "corrupt patch at line %d" msgstr "è¡¥ä¸æŸåä½äºŽç¬¬ %d è¡Œ" -#: builtin/apply.c:1701 +#: builtin/apply.c:1700 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s ä¾èµ–旧内容" -#: builtin/apply.c:1703 +#: builtin/apply.c:1702 #, c-format msgid "deleted file %s still has contents" msgstr "åˆ é™¤çš„æ–‡ä»¶ %s ä»æœ‰å†…容" -#: builtin/apply.c:1706 +#: builtin/apply.c:1705 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** è¦å‘Šï¼šæ–‡ä»¶ %s æˆä¸ºç©ºæ–‡ä»¶ä½†å¹¶æœªåˆ 除" -#: builtin/apply.c:1852 +#: builtin/apply.c:1851 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补ä¸åœ¨ç¬¬ %d è¡ŒæŸå：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1881 +#: builtin/apply.c:1880 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补ä¸ä½äºŽç¬¬ %d è¡Œ" -#: builtin/apply.c:1967 +#: builtin/apply.c:1966 #, c-format msgid "patch with only garbage at line %d" msgstr "è¡¥ä¸æ–‡ä»¶çš„第 %d è¡Œåªæœ‰åžƒåœ¾æ•°æ®" -#: builtin/apply.c:2057 +#: builtin/apply.c:2056 #, c-format msgid "unable to read symlink %s" msgstr "æ— æ³•è¯»å–符å·é“¾æŽ¥ %s" -#: builtin/apply.c:2061 +#: builtin/apply.c:2060 #, c-format msgid "unable to open or read %s" msgstr "ä¸èƒ½æ‰“å¼€æˆ–è¯»å– %s" -#: builtin/apply.c:2132 +#: builtin/apply.c:2131 msgid "oops" msgstr "å“Žå“Ÿ" -#: builtin/apply.c:2654 +#: builtin/apply.c:2653 #, c-format msgid "invalid start of line: '%c'" msgstr "æ— æ•ˆçš„è¡Œé¦–å—符：'%c'" -#: builtin/apply.c:2772 +#: builtin/apply.c:2771 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "å— #%d æˆåŠŸåº”用于 %d (å移 %d 行）" msgstr[1] "å— #%d æˆåŠŸåº”用于 %d (å移 %d 行）" -#: builtin/apply.c:2784 +#: builtin/apply.c:2783 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文å‡å°‘到（%ld/%ld）以在第 %d 行应用补ä¸ç‰‡æ®µ" -#: builtin/apply.c:2790 +#: builtin/apply.c:2789 #, c-format msgid "" "while searching for:\n" @@ -1567,321 +1564,321 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2809 +#: builtin/apply.c:2808 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补ä¸æ•°æ®" -#: builtin/apply.c:2912 +#: builtin/apply.c:2911 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补ä¸æœªåº”用到 '%s'" -#: builtin/apply.c:2918 +#: builtin/apply.c:2917 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补ä¸äº§ç”Ÿäº†ä¸æ£ç¡®çš„结果（预期 %s，得到 %s）" -#: builtin/apply.c:2939 +#: builtin/apply.c:2938 #, c-format msgid "patch failed: %s:%ld" msgstr "打补ä¸å¤±è´¥ï¼š%s:%ld" -#: builtin/apply.c:3061 +#: builtin/apply.c:3060 #, c-format msgid "cannot checkout %s" msgstr "ä¸èƒ½æ£€å‡º %s" -#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159 +#: builtin/apply.c:3105 builtin/apply.c:3114 builtin/apply.c:3158 #, c-format msgid "read of %s failed" msgstr "è¯»å– %s 失败" -#: builtin/apply.c:3139 builtin/apply.c:3361 +#: builtin/apply.c:3138 builtin/apply.c:3360 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s å·²ç»è¢«é‡å‘½å/åˆ é™¤" -#: builtin/apply.c:3220 builtin/apply.c:3375 +#: builtin/apply.c:3219 builtin/apply.c:3374 #, c-format msgid "%s: does not exist in index" msgstr "%s：ä¸å˜åœ¨äºŽç´¢å¼•ä¸" -#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389 +#: builtin/apply.c:3223 builtin/apply.c:3366 builtin/apply.c:3388 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3229 builtin/apply.c:3383 +#: builtin/apply.c:3228 builtin/apply.c:3382 #, c-format msgid "%s: does not match index" msgstr "%s：和索引ä¸åŒ¹é…" -#: builtin/apply.c:3331 +#: builtin/apply.c:3330 msgid "removal patch leaves file contents" msgstr "移除补ä¸ä»ç•™ä¸‹äº†æ–‡ä»¶å†…容" -#: builtin/apply.c:3400 +#: builtin/apply.c:3399 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3402 +#: builtin/apply.c:3401 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，预期是 %o" -#: builtin/apply.c:3503 +#: builtin/apply.c:3502 #, c-format msgid "%s: already exists in index" msgstr "%s：已ç»å˜åœ¨äºŽç´¢å¼•ä¸" -#: builtin/apply.c:3506 +#: builtin/apply.c:3505 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已ç»å˜åœ¨äºŽå·¥ä½œåŒºä¸" -#: builtin/apply.c:3526 +#: builtin/apply.c:3525 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模å¼ï¼ˆ%1$o）和旧模å¼ï¼ˆ%3$o）ä¸åŒ¹é…" -#: builtin/apply.c:3531 +#: builtin/apply.c:3530 #, 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:3539 +#: builtin/apply.c:3538 #, c-format msgid "%s: patch does not apply" msgstr "%s：补ä¸æœªåº”用" -#: builtin/apply.c:3552 +#: builtin/apply.c:3551 #, c-format msgid "Checking patch %s..." msgstr "æ£€æŸ¥è¡¥ä¸ %s..." -#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158 +#: builtin/apply.c:3606 builtin/checkout.c:213 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' çš„ make_cache_entry æ“作失败" -#: builtin/apply.c:3750 +#: builtin/apply.c:3749 #, c-format msgid "unable to remove %s from index" msgstr "ä¸èƒ½ä»Žç´¢å¼•ä¸ç§»é™¤ %s" -#: builtin/apply.c:3778 +#: builtin/apply.c:3777 #, c-format msgid "corrupt patch for subproject %s" msgstr "å项目 %s æŸåçš„è¡¥ä¸" -#: builtin/apply.c:3782 +#: builtin/apply.c:3781 #, c-format msgid "unable to stat newly created file '%s'" msgstr "ä¸èƒ½æžšä¸¾æ–°å»ºæ–‡ä»¶ '%s' 的状æ€" -#: builtin/apply.c:3787 +#: builtin/apply.c:3786 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "ä¸èƒ½ä¸ºæ–°å»ºæ–‡ä»¶ %s 创建åŽç«¯å˜å‚¨" -#: builtin/apply.c:3790 builtin/apply.c:3898 +#: builtin/apply.c:3789 builtin/apply.c:3897 #, c-format msgid "unable to add cache entry for %s" msgstr "æ— æ³•ä¸º %s æ·»åŠ ç¼“å˜æ¡ç›®" -#: builtin/apply.c:3823 +#: builtin/apply.c:3822 #, c-format msgid "closing file '%s'" msgstr "å…³é—文件 '%s'" -#: builtin/apply.c:3872 +#: builtin/apply.c:3871 #, c-format msgid "unable to write file '%s' mode %o" msgstr "ä¸èƒ½å†™æ–‡ä»¶ '%s' æƒé™ %o" -#: builtin/apply.c:3959 +#: builtin/apply.c:3958 #, c-format msgid "Applied patch %s cleanly." msgstr "æˆåŠŸåº”ç”¨è¡¥ä¸ %s。" -#: builtin/apply.c:3967 +#: builtin/apply.c:3966 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3970 +#: builtin/apply.c:3969 #, 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:3980 +#: builtin/apply.c:3979 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "æˆªçŸ .rej 文件å为 %.*s.rej" -#: builtin/apply.c:4001 +#: builtin/apply.c:4000 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段æˆåŠŸåº”用。" -#: builtin/apply.c:4004 +#: builtin/apply.c:4003 #, c-format msgid "Rejected hunk #%d." msgstr "æ‹’ç»ç¬¬ #%d 个片段。" -#: builtin/apply.c:4154 +#: builtin/apply.c:4153 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4165 +#: builtin/apply.c:4164 msgid "unable to read index file" msgstr "æ— æ³•è¯»å–索引文件" -#: builtin/apply.c:4284 builtin/apply.c:4287 +#: builtin/apply.c:4283 builtin/apply.c:4286 msgid "path" msgstr "路径" -#: builtin/apply.c:4285 +#: builtin/apply.c:4284 msgid "don't apply changes matching the given path" msgstr "ä¸è¦åº”用与给出路径å‘匹é…çš„å˜æ›´" -#: builtin/apply.c:4288 +#: builtin/apply.c:4287 msgid "apply changes matching the given path" msgstr "应用与给出路径å‘匹é…çš„å˜æ›´" -#: builtin/apply.c:4290 +#: builtin/apply.c:4289 msgid "num" msgstr "æ•°å—" -#: builtin/apply.c:4291 +#: builtin/apply.c:4290 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ä»Žä¼ ç»Ÿçš„ diff 路径ä¸ç§»é™¤ <æ•°å—> 个å‰å¯¼è·¯å¾„" -#: builtin/apply.c:4294 +#: builtin/apply.c:4293 msgid "ignore additions made by the patch" msgstr "忽略补ä¸ä¸çš„æ·»åŠ çš„æ–‡ä»¶" -#: builtin/apply.c:4296 +#: builtin/apply.c:4295 msgid "instead of applying the patch, output diffstat for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的差异统计（diffstat）" -#: builtin/apply.c:4300 +#: builtin/apply.c:4299 msgid "shows number of added and deleted lines in decimal notation" msgstr "以数å—æ–¹å¼æ˜¾ç¤ºæ·»åŠ æˆ–åˆ é™¤è¡Œçš„æ•°é‡" -#: builtin/apply.c:4302 +#: builtin/apply.c:4301 msgid "instead of applying the patch, output a summary for the input" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æ˜¾ç¤ºè¾“入的概è¦" -#: builtin/apply.c:4304 +#: builtin/apply.c:4303 msgid "instead of applying the patch, see if the patch is applicable" msgstr "ä¸åº”用补ä¸ï¼Œè€Œæ˜¯æŸ¥çœ‹è¡¥ä¸æ˜¯å¦å¯åº”用" -#: builtin/apply.c:4306 +#: builtin/apply.c:4305 msgid "make sure the patch is applicable to the current index" msgstr "确认补ä¸å¯ä»¥åº”用到当å‰ç´¢å¼•" -#: builtin/apply.c:4308 +#: builtin/apply.c:4307 msgid "apply a patch without touching the working tree" msgstr "应用补ä¸è€Œä¸ä¿®æ”¹å·¥ä½œåŒº" -#: builtin/apply.c:4310 +#: builtin/apply.c:4309 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用æ¤è¡¥ä¸ï¼ˆä½¿ç”¨ --stat/--summary/--check å‚数）" -#: builtin/apply.c:4312 +#: builtin/apply.c:4311 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补ä¸ä¸èƒ½åº”用则å°è¯•ä¸‰è·¯åˆå¹¶" -#: builtin/apply.c:4314 +#: builtin/apply.c:4313 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信æ¯" -#: builtin/apply.c:4316 +#: builtin/apply.c:4315 msgid "paths are separated with NUL character" msgstr "路径以 NUL å—符分隔" -#: builtin/apply.c:4319 +#: builtin/apply.c:4318 msgid "ensure at least <n> lines of context match" msgstr "ç¡®ä¿è‡³å°‘åŒ¹é… <n> 行上下文" -#: builtin/apply.c:4320 +#: builtin/apply.c:4319 msgid "action" msgstr "动作" -#: builtin/apply.c:4321 +#: builtin/apply.c:4320 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行ä¸é—´çš„空白å—符滥用" -#: builtin/apply.c:4324 builtin/apply.c:4327 +#: builtin/apply.c:4323 builtin/apply.c:4326 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白å—符的å˜æ›´" -#: builtin/apply.c:4330 +#: builtin/apply.c:4329 msgid "apply the patch in reverse" msgstr "åå‘应用补ä¸" -#: builtin/apply.c:4332 +#: builtin/apply.c:4331 msgid "don't expect at least one line of context" msgstr "æ— éœ€è‡³å°‘ä¸€è¡Œä¸Šä¸‹æ–‡" -#: builtin/apply.c:4334 +#: builtin/apply.c:4333 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒ç»çš„è¡¥ä¸ç‰‡æ®µä¿å˜åœ¨å¯¹åº”çš„ *.rej 文件ä¸" -#: builtin/apply.c:4336 +#: builtin/apply.c:4335 msgid "allow overlapping hunks" msgstr "å…许é‡å çš„è¡¥ä¸ç‰‡æ®µ" -#: builtin/apply.c:4337 +#: builtin/apply.c:4336 msgid "be verbose" msgstr "冗长输出" -#: builtin/apply.c:4339 +#: builtin/apply.c:4338 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "宽容ä¸æ£ç¡®çš„文件末尾æ¢è¡Œç¬¦" -#: builtin/apply.c:4342 +#: builtin/apply.c:4341 msgid "do not trust the line counts in the hunk headers" msgstr "ä¸ä¿¡ä»»è¡¥ä¸ç‰‡æ®µçš„头信æ¯ä¸çš„è¡Œå·" -#: builtin/apply.c:4344 +#: builtin/apply.c:4343 msgid "root" msgstr "æ ¹ç›®å½•" -#: builtin/apply.c:4345 +#: builtin/apply.c:4344 msgid "prepend <root> to all filenames" msgstr "为所有文件åå‰æ·»åŠ <æ ¹ç›®å½•>" -#: builtin/apply.c:4367 +#: builtin/apply.c:4366 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4375 +#: builtin/apply.c:4374 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4378 +#: builtin/apply.c:4377 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4394 +#: builtin/apply.c:4393 #, c-format msgid "can't open patch '%s'" msgstr "ä¸èƒ½æ‰“å¼€è¡¥ä¸ '%s'" -#: builtin/apply.c:4408 +#: builtin/apply.c:4407 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下ä»æœ‰ %d 个空白å—符误用" msgstr[1] "抑制下ä»æœ‰ %d 个空白å—符误用" -#: builtin/apply.c:4414 builtin/apply.c:4424 +#: builtin/apply.c:4413 builtin/apply.c:4423 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2143,7 +2140,7 @@ msgstr "path '%s'ï¼šæ— æ³•åˆå¹¶" msgid "Unable to add merge result for '%s'" msgstr "æ— æ³•ä¸º '%s' æ·»åŠ åˆå¹¶ç»“æžœ" -#: builtin/checkout.c:235 builtin/checkout.c:393 +#: builtin/checkout.c:235 builtin/checkout.c:392 msgid "corrupt index file" msgstr "æŸå的索引文件" @@ -2152,61 +2149,57 @@ msgstr "æŸå的索引文件" msgid "path '%s' is unmerged" msgstr "路径 '%s' 未åˆå¹¶" -#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586 -#: builtin/merge.c:812 +#: builtin/checkout.c:303 builtin/checkout.c:498 builtin/clone.c:586 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "æ— æ³•å†™æ–°çš„ç´¢å¼•æ–‡ä»¶" -#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408 -msgid "diff_setup_done failed" -msgstr "diff_setup_done 失败" - -#: builtin/checkout.c:415 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "您需è¦å…ˆè§£å†³å½“å‰ç´¢å¼•çš„冲çª" -#: builtin/checkout.c:534 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "ä¸èƒ½å¯¹ '%s' 执行 reflog æ“作\n" -#: builtin/checkout.c:567 +#: builtin/checkout.c:566 msgid "HEAD is now at" msgstr "HEAD ç›®å‰ä½äºŽ" -#: builtin/checkout.c:574 +#: builtin/checkout.c:573 #, c-format msgid "Reset branch '%s'\n" msgstr "é‡ç½®åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:577 +#: builtin/checkout.c:576 #, c-format msgid "Already on '%s'\n" msgstr "å·²ç»ä½äºŽ '%s'\n" -#: builtin/checkout.c:581 +#: builtin/checkout.c:580 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "切æ¢å¹¶é‡ç½®åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:583 +#: builtin/checkout.c:582 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切æ¢åˆ°ä¸€ä¸ªæ–°åˆ†æ”¯ '%s'\n" -#: builtin/checkout.c:585 +#: builtin/checkout.c:584 #, c-format msgid "Switched to branch '%s'\n" msgstr "切æ¢åˆ°åˆ†æ”¯ '%s'\n" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: builtin/checkout.c:641 +#: builtin/checkout.c:640 #, c-format msgid " ... and %d more.\n" msgstr " ... åŠå…¶å®ƒ %d 个。\n" #. The singular version -#: builtin/checkout.c:647 +#: builtin/checkout.c:646 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -2227,7 +2220,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:665 +#: builtin/checkout.c:664 #, c-format msgid "" "If you want to keep them by creating a new branch, this may be a good time\n" @@ -2242,71 +2235,71 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:695 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "在版本é历时é‡åˆ°å†…部错误" -#: builtin/checkout.c:699 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "之å‰çš„ HEAD ä½ç½®æ˜¯" -#: builtin/checkout.c:725 builtin/checkout.c:920 +#: builtin/checkout.c:724 builtin/checkout.c:919 msgid "You are on a branch yet to be born" msgstr "您ä½äºŽä¸€ä¸ªå°šæœªåˆå§‹åŒ–的分支" #. case (1) -#: builtin/checkout.c:856 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "æ— æ•ˆå¼•ç”¨ï¼š%s" #. case (1): want a tree -#: builtin/checkout.c:895 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "引用ä¸æ˜¯ä¸€ä¸ªæ ‘：%s" -#: builtin/checkout.c:977 +#: builtin/checkout.c:976 msgid "-B cannot be used with -b" msgstr "-B ä¸èƒ½å’Œ -b åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:986 +#: builtin/checkout.c:985 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项ä¸å…¼å®¹" -#: builtin/checkout.c:989 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach ä¸èƒ½å’Œ -b/-B/--orphan åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:991 +#: builtin/checkout.c:990 msgid "--detach cannot be used with -t" msgstr "--detach ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:997 +#: builtin/checkout.c:996 msgid "--track needs a branch name" msgstr "--track 需è¦ä¸€ä¸ªåˆ†æ”¯å" -#: builtin/checkout.c:1004 +#: builtin/checkout.c:1003 msgid "Missing branch name; try -b" msgstr "缺少分支åï¼›å°è¯• -b" -#: builtin/checkout.c:1010 +#: builtin/checkout.c:1009 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan å’Œ -b|-B 互斥" -#: builtin/checkout.c:1012 +#: builtin/checkout.c:1011 msgid "--orphan cannot be used with -t" msgstr "--orphan ä¸èƒ½å’Œ -t åŒæ—¶ä½¿ç”¨" -#: builtin/checkout.c:1022 +#: builtin/checkout.c:1021 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout：-f å’Œ -m ä¸å…¼å®¹" -#: builtin/checkout.c:1056 +#: builtin/checkout.c:1055 msgid "invalid path specification" msgstr "æ— æ•ˆçš„è·¯å¾„è§„æ ¼" -#: builtin/checkout.c:1064 +#: builtin/checkout.c:1063 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -2315,26 +2308,26 @@ msgstr "" "git checkout：更新路径和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚\n" "您是想è¦æ£€å‡º '%s' 但未能将其解æžä¸ºæ交么？" -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1065 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout：更新路径和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1070 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout：--detach ä¸è·Ÿè·¯å¾„å‚æ•°" -#: builtin/checkout.c:1074 +#: builtin/checkout.c:1073 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirsã€--force å’Œ --merge ä¸å…¼å®¹ã€‚" -#: builtin/checkout.c:1093 +#: builtin/checkout.c:1092 msgid "Cannot switch branch to a non-commit." msgstr "æ— æ³•åˆ‡æ¢åˆ†æ”¯åˆ°ä¸€ä¸ªéžæ交。" -#: builtin/checkout.c:1096 +#: builtin/checkout.c:1095 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs 和切æ¢åˆ†æ”¯ä¸å…¼å®¹ã€‚" @@ -2390,7 +2383,7 @@ msgstr "引用版本库 '%s' ä¸æ˜¯ä¸€ä¸ªæœ¬åœ°ç›®å½•ã€‚" msgid "failed to create directory '%s'" msgstr "æ— æ³•åˆ›å»ºç›®å½• '%s'" -#: builtin/clone.c:308 builtin/diff.c:75 +#: builtin/clone.c:308 builtin/diff.c:77 #, c-format msgid "failed to stat '%s'" msgstr "æ— æ³•æžšä¸¾ '%s' 状æ€" @@ -2405,11 +2398,6 @@ msgstr "%s å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªç›®å½•" msgid "failed to stat %s\n" msgstr "æ— æ³•æžšä¸¾ %s 状æ€\n" -#: builtin/clone.c:341 -#, c-format -msgid "failed to unlink '%s'" -msgstr "æ— æ³•åˆ é™¤ '%s'" - #: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" @@ -2796,7 +2784,7 @@ msgstr "ï¼ˆæ ¹æ交）" msgid "could not parse HEAD commit" msgstr "ä¸èƒ½è§£æž HEAD æ交" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "ä¸èƒ½ä¸ºè¯»å…¥æ‰“å¼€ '%s'" @@ -2825,7 +2813,7 @@ msgstr "终æ¢æ交；您未更改æ¥è‡ªæ¨¡ç‰ˆçš„æ交说明。\n" msgid "Aborting commit due to empty commit message.\n" msgstr "终æ¢æäº¤å› ä¸ºæ交说明为空。\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1554 builtin/merge.c:935 builtin/merge.c:960 msgid "failed to write commit object" msgstr "æ— æ³•å†™æ交对象" @@ -2930,36 +2918,36 @@ msgstr "没有å‘现åç§°ï¼Œæ— æ³•æ述任何东西。" msgid "--dirty is incompatible with committishes" msgstr "--dirty ä¸èƒ½ä¸Žæ交åŒæ—¶ä½¿ç”¨" -#: builtin/diff.c:77 +#: builtin/diff.c:79 #, c-format msgid "'%s': not a regular file or symlink" msgstr "'%s'：ä¸æ˜¯ä¸€ä¸ªæ£è§„文件或符å·é“¾æŽ¥" -#: builtin/diff.c:220 +#: builtin/diff.c:224 #, c-format msgid "invalid option: %s" msgstr "æ— æ•ˆé€‰é¡¹ï¼š%s" -#: builtin/diff.c:297 +#: builtin/diff.c:301 msgid "Not a git repository" msgstr "ä¸æ˜¯ä¸€ä¸ª git 版本库" -#: builtin/diff.c:341 +#: builtin/diff.c:344 #, c-format msgid "invalid object '%s' given." msgstr "æä¾›äº†æ— æ•ˆå¯¹è±¡ '%s'。" -#: builtin/diff.c:346 +#: builtin/diff.c:349 #, c-format msgid "more than %d trees given: '%s'" msgstr "æ供了超过 %d ä¸ªæ ‘å¯¹è±¡ï¼š'%s'" -#: builtin/diff.c:356 +#: builtin/diff.c:359 #, c-format msgid "more than two blobs given: '%s'" msgstr "æ供了超过两个二进制对象（blob）：'%s'" -#: builtin/diff.c:364 +#: builtin/diff.c:367 #, c-format msgid "unhandled object '%s' given." msgstr "æä¾›äº†æ— æ³•å¤„ç†çš„对象 '%s'。" @@ -3154,57 +3142,57 @@ msgstr "有太多ä¸å¯è¾¾çš„æ¾æ•£å¯¹è±¡ï¼Œè¿è¡Œ 'git prune' åˆ é™¤å®ƒä»¬ã€‚" msgid "grep: failed to create thread: %s" msgstr "grepï¼šæ— æ³•åˆ›å»ºçº¿ç¨‹ï¼š%s" -#: builtin/grep.c:402 +#: builtin/grep.c:454 #, c-format msgid "Failed to chdir: %s" msgstr "æ— æ³•åˆ‡æ¢ç›®å½•ï¼š%s" -#: builtin/grep.c:478 builtin/grep.c:512 +#: builtin/grep.c:530 builtin/grep.c:564 #, c-format msgid "unable to read tree (%s)" msgstr "æ— æ³•è¯»å–æ ‘ï¼ˆ%s）" -#: builtin/grep.c:526 +#: builtin/grep.c:578 #, c-format msgid "unable to grep from object of type %s" msgstr "æ— æ³•æŠ“å–æ¥è‡ªäºŽ %s 类型的对象" -#: builtin/grep.c:584 +#: builtin/grep.c:636 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数å—值" -#: builtin/grep.c:601 +#: builtin/grep.c:653 #, c-format msgid "cannot open '%s'" msgstr "ä¸èƒ½æ‰“å¼€ '%s'" -#: builtin/grep.c:885 +#: builtin/grep.c:917 msgid "no pattern given." msgstr "未æ供模å¼åŒ¹é…。" -#: builtin/grep.c:899 +#: builtin/grep.c:931 #, c-format msgid "bad object %s" msgstr "å对象 %s" -#: builtin/grep.c:940 +#: builtin/grep.c:972 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:963 +#: builtin/grep.c:995 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked ä¸èƒ½ä¸Ž --no-index åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/grep.c:968 +#: builtin/grep.c:1000 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked ä¸èƒ½å’Œç‰ˆæœ¬åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/grep.c:971 +#: builtin/grep.c:1003 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard ä¸èƒ½ç”¨äºŽå·²è·Ÿè¸ªå†…容。" -#: builtin/grep.c:979 +#: builtin/grep.c:1011 msgid "both --cached and trees are given." msgstr "åŒæ—¶ç»™å‡ºäº† --cached å’Œæ ‘å¯¹è±¡ã€‚" @@ -3699,64 +3687,64 @@ msgstr "åªéœ€è¦ä¸€ä¸ªèŒƒå›´ã€‚" msgid "Not a range." msgstr "ä¸æ˜¯ä¸€ä¸ªèŒƒå›´ã€‚" -#: builtin/log.c:792 +#: builtin/log.c:789 msgid "Cover letter needs email format" msgstr "ä¿¡å°éœ€è¦é‚®ä»¶åœ°å€æ ¼å¼" -#: builtin/log.c:865 +#: builtin/log.c:862 #, c-format msgid "insane in-reply-to: %s" msgstr "ä¸æ£å¸¸çš„ in-reply-to：%s" -#: builtin/log.c:938 +#: builtin/log.c:935 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1160 +#: builtin/log.c:1157 #, c-format msgid "bogus committer info %s" msgstr "虚å‡çš„æäº¤è€…ä¿¡æ¯ %s" -#: builtin/log.c:1205 +#: builtin/log.c:1202 msgid "-n and -k are mutually exclusive." msgstr "-n å’Œ -k 互斥。" -#: builtin/log.c:1207 +#: builtin/log.c:1204 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix å’Œ -k 互斥。" -#: builtin/log.c:1215 +#: builtin/log.c:1212 msgid "--name-only does not make sense" msgstr "--name-only æ— æ„义" -#: builtin/log.c:1217 +#: builtin/log.c:1214 msgid "--name-status does not make sense" msgstr "--name-status æ— æ„义" -#: builtin/log.c:1219 +#: builtin/log.c:1216 msgid "--check does not make sense" msgstr "--check æ— æ„义" -#: builtin/log.c:1242 +#: builtin/log.c:1239 msgid "standard output, or directory, which one?" msgstr "æ ‡å‡†è¾“å‡ºæˆ–ç›®å½•ï¼Œå“ªä¸€ä¸ªï¼Ÿ" -#: builtin/log.c:1244 +#: builtin/log.c:1241 #, c-format msgid "Could not create directory '%s'" msgstr "ä¸èƒ½åˆ›å»ºç›®å½• '%s'" -#: builtin/log.c:1397 +#: builtin/log.c:1394 msgid "Failed to create output files" msgstr "æ— æ³•åˆ›å»ºè¾“å‡ºæ–‡ä»¶" -#: builtin/log.c:1501 +#: builtin/log.c:1498 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "ä¸èƒ½æ‰¾åˆ°è·Ÿè¸ªçš„远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 #, c-format msgid "Unknown commit %s" msgstr "未知æ交 %s" @@ -3820,49 +3808,49 @@ msgstr "å®Œæˆ SQUASH_MSG" msgid "No merge message -- not updating HEAD\n" msgstr "æ— åˆå¹¶ä¿¡æ¯ -- 未更新 HEAD\n" -#: builtin/merge.c:437 +#: builtin/merge.c:436 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指å‘一个æ交" -#: builtin/merge.c:536 +#: builtin/merge.c:535 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "åçš„ branch.%s.mergeoptions å—符串：%s" -#: builtin/merge.c:629 +#: builtin/merge.c:628 msgid "git write-tree failed to write a tree" msgstr "git write-tree æ— æ³•å†™å…¥ä¸€æ ‘å¯¹è±¡" -#: builtin/merge.c:679 +#: builtin/merge.c:678 msgid "failed to read the cache" msgstr "æ— æ³•è¯»å–缓å˜" -#: builtin/merge.c:710 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "ä¸èƒ½å¤„ç†ä¸¤ä¸ªå¤´åˆå¹¶ä¹‹å¤–的任何æ“作。" -#: builtin/merge.c:724 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:738 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "ä¸èƒ½å†™ %s" -#: builtin/merge.c:877 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "ä¸èƒ½ä»Ž '%s' 读å–" -#: builtin/merge.c:886 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未æ交åˆå¹¶ï¼Œä½¿ç”¨ 'git commit' 完æˆæ¤æ¬¡åˆå¹¶ã€‚\n" -#: builtin/merge.c:892 +#: builtin/merge.c:891 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" @@ -3875,52 +3863,52 @@ msgstr "" "\n" "以 '#' 开头的行将被忽略，而且空æ交说明将会终æ¢æ交。\n" -#: builtin/merge.c:916 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "空æ交信æ¯ã€‚" -#: builtin/merge.c:928 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:993 +#: builtin/merge.c:992 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动åˆå¹¶å¤±è´¥ï¼Œä¿®æ£å†²çªç„¶åŽæ交修æ£çš„结果。\n" -#: builtin/merge.c:1009 +#: builtin/merge.c:1008 #, c-format msgid "'%s' is not a commit" msgstr "'%s' ä¸æ˜¯ä¸€ä¸ªæ交" -#: builtin/merge.c:1050 +#: builtin/merge.c:1049 msgid "No current branch." msgstr "没有当å‰åˆ†æ”¯ã€‚" -#: builtin/merge.c:1052 +#: builtin/merge.c:1051 msgid "No remote for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å¯¹åº”的远程版本库。" -#: builtin/merge.c:1054 +#: builtin/merge.c:1053 msgid "No default upstream defined for the current branch." msgstr "当å‰åˆ†æ”¯æ²¡æœ‰å®šä¹‰é»˜è®¤çš„上游分支。" -#: builtin/merge.c:1059 +#: builtin/merge.c:1058 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有æ¥è‡ª %s 的远程跟踪分支" -#: builtin/merge.c:1146 builtin/merge.c:1303 +#: builtin/merge.c:1145 builtin/merge.c:1302 #, c-format msgid "%s - not something we can merge" msgstr "%s - ä¸èƒ½è¢«åˆå¹¶" -#: builtin/merge.c:1214 +#: builtin/merge.c:1213 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有è¦ç»ˆæ¢çš„åˆå¹¶ï¼ˆMERGE_HEAD 丢失）。" -#: builtin/merge.c:1230 git-pull.sh:31 +#: builtin/merge.c:1229 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3928,11 +3916,11 @@ msgstr "" "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD）。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" -#: builtin/merge.c:1233 git-pull.sh:34 +#: builtin/merge.c:1232 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„åˆå¹¶ï¼ˆå˜åœ¨ MERGE_HEAD）。" -#: builtin/merge.c:1237 +#: builtin/merge.c:1236 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -3940,79 +3928,79 @@ msgstr "" "您尚未结æŸæ‚¨çš„拣选（å˜åœ¨ CHERRY_PICK_HEAD）。\n" "请在åˆå¹¶å‰å…ˆæ交您的修改。" -#: builtin/merge.c:1240 +#: builtin/merge.c:1239 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结æŸæ‚¨çš„拣选（å˜åœ¨ CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1249 +#: builtin/merge.c:1248 msgid "You cannot combine --squash with --no-ff." msgstr "您ä¸èƒ½å°† --squash 与 --no-ff åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/merge.c:1254 +#: builtin/merge.c:1253 msgid "You cannot combine --no-ff with --ff-only." msgstr "您ä¸èƒ½å°† --no-ff 与 --ff-only åŒæ—¶ä½¿ç”¨ã€‚" -#: builtin/merge.c:1261 +#: builtin/merge.c:1260 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定æ交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1293 +#: builtin/merge.c:1292 msgid "Can merge only exactly one commit into empty head" msgstr "åªèƒ½å°†ä¸€ä¸ªæ交åˆå¹¶åˆ°ç©ºåˆ†æ”¯ä¸Š" -#: builtin/merge.c:1296 +#: builtin/merge.c:1295 msgid "Squash commit into empty head not supported yet" msgstr "å°šä¸æ”¯æŒåˆ°ç©ºåˆ†æ”¯çš„压缩æ交" -#: builtin/merge.c:1298 +#: builtin/merge.c:1297 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的éžå¿«è¿›å¼æ交没有æ„义" -#: builtin/merge.c:1413 +#: builtin/merge.c:1412 #, c-format msgid "Updating %s..%s\n" msgstr "æ›´æ–° %s..%s\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "å°è¯•éžå¸¸å°çš„索引内åˆå¹¶...\n" -#: builtin/merge.c:1458 +#: builtin/merge.c:1457 #, c-format msgid "Nope.\n" msgstr "æ— ã€‚\n" -#: builtin/merge.c:1490 +#: builtin/merge.c:1489 msgid "Not possible to fast-forward, aborting." msgstr "æ— æ³•å¿«è¿›ï¼Œç»ˆæ¢ã€‚" -#: builtin/merge.c:1513 builtin/merge.c:1592 +#: builtin/merge.c:1512 builtin/merge.c:1591 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "å°†æ ‘å›žæ»šè‡³åŽŸå§‹çŠ¶æ€...\n" -#: builtin/merge.c:1517 +#: builtin/merge.c:1516 #, c-format msgid "Trying merge strategy %s...\n" msgstr "å°è¯•åˆå¹¶ç–ç•¥ %s...\n" -#: builtin/merge.c:1583 +#: builtin/merge.c:1582 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有åˆå¹¶ç–略处ç†æ¤åˆå¹¶ã€‚\n" -#: builtin/merge.c:1585 +#: builtin/merge.c:1584 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用ç–ç•¥ %s åˆå¹¶å¤±è´¥ã€‚\n" -#: builtin/merge.c:1594 +#: builtin/merge.c:1593 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1606 +#: builtin/merge.c:1605 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动åˆå¹¶è¿›å±•é¡ºåˆ©ï¼ŒæŒ‰è¦æ±‚在æ交å‰åœæ¢\n" @@ -4340,12 +4328,44 @@ msgstr "" "您æ£æŽ¨é€è‡³è¿œç¨‹ '%s'（其并éžå½“å‰åˆ†æ”¯ '%s' 的上游），\n" "而没有告诉我è¦æŽ¨é€ä»€ä¹ˆã€æ›´æ–°å“ªä¸ªè¿œç¨‹åˆ†æ”¯ã€‚" -#: builtin/push.c:174 +# 译者：å—符串首行行首è¦æ·»åŠ “warning: â€å—串，故æ¤é¦–è¡Œè¦è¾ƒå…¶ä½™è¡ŒçŸ +#: builtin/push.c:151 +msgid "" +"push.default is unset; its implicit value is changing in\n" +"Git 2.0 from 'matching' to 'simple'. To squelch this message\n" +"and maintain the current behavior after the default changes, use:\n" +"\n" +" git config --global push.default matching\n" +"\n" +"To squelch this message and adopt the new behavior now, use:\n" +"\n" +" git config --global push.default simple\n" +"\n" +"See 'git help config' and search for 'push.default' for further " +"information.\n" +"(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n" +"'current' instead of 'simple' if you sometimes use older versions of Git)" +msgstr "" +"push.default 未设置，它的默认值将会在 Git 2.0 ç”± 'matching'\n" +"修改为 'simple'。若è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶åœ¨å…¶é»˜è®¤å€¼æ”¹å˜åŽç»´æŒå½“å‰ä½¿ç”¨ä¹ 惯，\n" +"进行如下设置：\n" +"\n" +" git config --global push.default matching\n" +"\n" +"è‹¥è¦ä¸å†æ˜¾ç¤ºæœ¬ä¿¡æ¯å¹¶ä»ŽçŽ°åœ¨å¼€å§‹é‡‡ç”¨æ–°çš„ä½¿ç”¨ä¹ æƒ¯ï¼Œè®¾ç½®ï¼š\n" +"\n" +" git config --global push.default simple\n" +"\n" +"å‚è§ 'git help config' 并查找 'push.default' 以获å–更多信æ¯ã€‚\n" +"（'simple' 模å¼ç”± Git 1.7.11 版本引入。如果您有时è¦ä½¿ç”¨è€ç‰ˆæœ¬çš„ Git，\n" +"为ä¿æŒå…¼å®¹ï¼Œè¯·ç”¨ 'current' 代替 'simple' 模å¼ï¼‰" + +#: builtin/push.c:199 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推é€æŒ‡å®šä»»ä½•å¼•ç”¨è¡¨è¾¾å¼ï¼Œå¹¶ä¸” push.default 为 \"nothing\"。" -#: builtin/push.c:181 +#: builtin/push.c:206 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -4356,18 +4376,19 @@ msgstr "" "å†æ¬¡æŽ¨é€å‰ï¼Œå…ˆä¸Žè¿œç¨‹å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull'）。详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" -#: builtin/push.c:187 +#: builtin/push.c:212 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" -"specify branches to push or set the 'push.default' configuration\n" -"variable to 'current' or 'upstream' to push only the current branch." +"specify branches to push or set the 'push.default' configuration variable\n" +"to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "更新被拒ç»ï¼Œå› 为推é€çš„一个分支的最新æ交è½åŽäºŽå…¶å¯¹åº”的远程分支。\n" "如果您并éžæœ‰æ„推é€è¯¥åˆ†æ”¯ï¼Œæ‚¨å¯ä»¥åœ¨æŽ¨é€æ—¶æŒ‡å®šè¦æŽ¨é€çš„分支，或者将\n" -"é…ç½®å˜é‡ 'push.default' 设置为 'current' 或 'upstream' 以便åªæŽ¨é€å½“å‰åˆ†æ”¯ã€‚" +"é…ç½®å˜é‡ 'push.default' 设置为 'simple'ã€'current' 或 'upstream'\n" +"以便åªæŽ¨é€å½“å‰åˆ†æ”¯ã€‚" -#: builtin/push.c:193 +#: builtin/push.c:218 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -4378,22 +4399,22 @@ msgstr "" "检出该分支并与远程å˜æ›´åˆå¹¶ï¼ˆå¦‚ 'git pull'），然åŽå†æŽ¨é€ã€‚详è§\n" "'git push --help' ä¸çš„ 'Note about fast-forwards' å°èŠ‚。" -#: builtin/push.c:233 +#: builtin/push.c:258 #, c-format msgid "Pushing to %s\n" msgstr "推é€åˆ° %s\n" -#: builtin/push.c:237 +#: builtin/push.c:262 #, c-format msgid "failed to push some refs to '%s'" msgstr "æ— æ³•æŽ¨é€ä¸€äº›å¼•ç”¨åˆ° '%s'" -#: builtin/push.c:269 +#: builtin/push.c:294 #, c-format msgid "bad repository '%s'" msgstr "å的版本库 '%s'" -#: builtin/push.c:270 +#: builtin/push.c:295 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -4414,31 +4435,31 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:285 +#: builtin/push.c:310 msgid "--all and --tags are incompatible" msgstr "--all å’Œ --tags ä¸å…¼å®¹" -#: builtin/push.c:286 +#: builtin/push.c:311 msgid "--all can't be combined with refspecs" msgstr "--all ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼åŒæ—¶ä½¿ç”¨" -#: builtin/push.c:291 +#: builtin/push.c:316 msgid "--mirror and --tags are incompatible" msgstr "--mirror å’Œ --tags ä¸å…¼å®¹" -#: builtin/push.c:292 +#: builtin/push.c:317 msgid "--mirror can't be combined with refspecs" msgstr "--mirror ä¸èƒ½å’Œå¼•ç”¨è¡¨è¾¾å¼åŒæ—¶ä½¿ç”¨" -#: builtin/push.c:297 +#: builtin/push.c:322 msgid "--all and --mirror are incompatible" msgstr "--all å’Œ --mirror ä¸å…¼å®¹" -#: builtin/push.c:385 +#: builtin/push.c:410 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --allã€--mirror åŠ --tags ä¸å…¼å®¹" -#: builtin/push.c:387 +#: builtin/push.c:412 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有æ„义" @@ -5796,32 +5817,32 @@ msgstr "（为æ¢å¤æ•°æ®è¾“å…¥ \"git stash apply\"）" msgid "cannot strip one component off url '$remoteurl'" msgstr "æ— æ³•ä»Ž url '$remoteurl' 剥离一个组件" -#: git-submodule.sh:145 +#: git-submodule.sh:167 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules ä¸å‘现路径 '$sm_path' çš„åæ¨¡ç»„æ˜ å°„" -#: git-submodule.sh:189 +#: git-submodule.sh:211 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "æ— æ³•å…‹éš† '$url' 到å模组路径 '$sm_path'" -#: git-submodule.sh:201 +#: git-submodule.sh:223 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在å模组路径 '$b' 之下或者相å" -#: git-submodule.sh:290 +#: git-submodule.sh:312 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是ç»å¯¹è·¯å¾„或以 ./|../ 起始" -#: git-submodule.sh:307 +#: git-submodule.sh:329 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' å·²ç»å˜åœ¨äºŽç´¢å¼•ä¸" -#: git-submodule.sh:311 +#: git-submodule.sh:333 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -5832,62 +5853,62 @@ msgstr "" "$sm_path\n" "å¦‚æžœæ‚¨ç¡®å®žæƒ³æ·»åŠ å®ƒï¼Œä½¿ç”¨ -f å‚数。" -#: git-submodule.sh:322 +#: git-submodule.sh:344 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "æ·»åŠ ä½äºŽ '$sm_path' 的现å˜ç‰ˆæœ¬åº“到索引" -#: git-submodule.sh:324 +#: git-submodule.sh:346 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' å·²å˜åœ¨ä¸”ä¸æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ git 版本库" -#: git-submodule.sh:338 +#: git-submodule.sh:360 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "ä¸èƒ½æ£€å‡ºå模组 '$sm_path'" -#: git-submodule.sh:343 +#: git-submodule.sh:365 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "æ— æ³•æ·»åŠ å模组 '$sm_path'" -#: git-submodule.sh:348 +#: git-submodule.sh:370 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "æ— æ³•æ³¨å†Œå模组 '$sm_path'" -#: git-submodule.sh:390 +#: git-submodule.sh:413 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "æ£åœ¨è¿›å…¥ '$prefix$sm_path'" -#: git-submodule.sh:404 +#: git-submodule.sh:427 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "åœæ¢äºŽ '$sm_path'，脚本返回éžé›¶å€¼ã€‚" -#: git-submodule.sh:447 +#: git-submodule.sh:471 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules ä¸æœªæ‰¾åˆ°å模组路径 '$sm_path' çš„ url" -#: git-submodule.sh:456 +#: git-submodule.sh:480 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:458 +#: git-submodule.sh:482 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "å模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:466 +#: git-submodule.sh:490 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "æ— æ³•ä¸ºå模组路径 '$sm_path' 注册更新模å¼" -#: git-submodule.sh:565 +#: git-submodule.sh:590 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -5896,92 +5917,101 @@ msgstr "" "å模组路径 '$sm_path' 没有åˆå§‹åŒ–\n" "也许您想用 'update --init'？" -#: git-submodule.sh:578 +#: git-submodule.sh:603 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ‰¾åˆ°å½“å‰ç‰ˆæœ¬" -#: git-submodule.sh:597 +#: git-submodule.sh:622 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸èŽ·å–" -#: git-submodule.sh:611 +#: git-submodule.sh:636 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸å˜åŸº '$sha1'" -#: git-submodule.sh:612 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "å模组路径 '$sm_path'：å˜åŸºè‡³ '$sha1'" -#: git-submodule.sh:617 +#: git-submodule.sh:642 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åˆå¹¶ '$sha1' 到å模组路径 '$sm_path' ä¸" -#: git-submodule.sh:618 +#: git-submodule.sh:643 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "å模组路径 '$sm_path'：已åˆå¹¶å…¥ '$sha1'" -#: git-submodule.sh:623 +#: git-submodule.sh:648 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "æ— æ³•åœ¨å模组路径 '$sm_path' ä¸æ£€å‡º '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:649 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "å模组路径 '$sm_path'：检出 '$sha1'" -#: git-submodule.sh:646 git-submodule.sh:969 +#: git-submodule.sh:671 git-submodule.sh:995 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "æ— æ³•é€’å½’è¿›å模组路径 '$sm_path'" -#: git-submodule.sh:754 +#: git-submodule.sh:779 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached ä¸èƒ½å’Œé€‰é¡¹ --files åŒæ—¶ä½¿ç”¨" #. unexpected type -#: git-submodule.sh:794 +#: git-submodule.sh:819 #, sh-format msgid "unexpected mode $mod_dst" msgstr "æ„å¤–çš„æ¨¡å¼ $mod_dst" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:812 +#: git-submodule.sh:837 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:815 +#: git-submodule.sh:840 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_dst" # 译者：注æ„ä¿æŒå‰å¯¼ç©ºæ ¼ -#: git-submodule.sh:818 +#: git-submodule.sh:843 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " è¦å‘Šï¼š$name 未包å«æ交 $sha1_src å’Œ $sha1_dst" -#: git-submodule.sh:843 +#: git-submodule.sh:868 msgid "blob" msgstr "二进制对象" -#: git-submodule.sh:881 +#: git-submodule.sh:906 msgid "# Submodules changed but not updated:" msgstr "# å模组已修改但尚未更新：" -#: git-submodule.sh:883 +#: git-submodule.sh:908 msgid "# Submodule changes to be committed:" msgstr "è¦æ交的å模组å˜æ›´ï¼š" -#: git-submodule.sh:1027 +#: git-submodule.sh:1054 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' åŒæ¥å模组 url" + +#~ msgid "diff setup failed" +#~ msgstr "diff 设置失败" + +#~ msgid "merge-recursive: disk full?" +#~ msgstr "merge-recursive：ç£ç›˜å·²æ»¡ï¼Ÿ" + +#~ msgid "diff_setup_done failed" +#~ msgstr "diff_setup_done 失败" diff --git a/read-cache.c b/read-cache.c index 79e3bbe024..fda78bc353 100644 --- a/read-cache.c +++ b/read-cache.c @@ -424,7 +424,7 @@ int cache_name_compare(const char *name1, int len1, const char *name2, int len2) return cache_name_stage_compare(name1, len1, 0, name2, len2, 0); } -int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage) +static int index_name_stage_pos(const struct index_state *istate, const char *name, int namelen, int stage) { int first, last; @@ -25,7 +25,7 @@ const char *rerere_path(const char *hex, const char *file) return git_path("rr-cache/%s/%s", hex, file); } -int has_rerere_resolution(const char *hex) +static int has_rerere_resolution(const char *hex) { struct stat st; return !stat(rerere_path(hex, "postimage"), &st); @@ -16,7 +16,6 @@ extern void *RERERE_RESOLVED; extern int setup_rerere(struct string_list *, int); extern int rerere(int); extern const char *rerere_path(const char *hex, const char *file); -extern int has_rerere_resolution(const char *hex); extern int rerere_forget(const char **); extern int rerere_remaining(struct string_list *); extern void rerere_clear(struct string_list *); diff --git a/revision.c b/revision.c index cbcae1086b..ae12e11fb7 100644 --- a/revision.c +++ b/revision.c @@ -1312,7 +1312,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") || !strcmp(arg, "--bisect") || !prefixcmp(arg, "--glob=") || !prefixcmp(arg, "--branches=") || !prefixcmp(arg, "--tags=") || - !prefixcmp(arg, "--remotes=")) + !prefixcmp(arg, "--remotes=") || !prefixcmp(arg, "--no-walk=")) { unkv[(*unkc)++] = arg; return 1; @@ -1598,6 +1598,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg } else if ((argcount = parse_long_opt("grep", argv, &optarg))) { add_message_grep(revs, optarg); return argcount; + } else if (!strcmp(arg, "--grep-debug")) { + revs->grep_filter.debug = 1; } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) { revs->grep_filter.regflags |= REG_EXTENDED; } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) { @@ -1707,7 +1709,18 @@ static int handle_revision_pseudo_opt(const char *submodule, } else if (!strcmp(arg, "--not")) { *flags ^= UNINTERESTING; } else if (!strcmp(arg, "--no-walk")) { - revs->no_walk = 1; + revs->no_walk = REVISION_WALK_NO_WALK_SORTED; + } else if (!prefixcmp(arg, "--no-walk=")) { + /* + * Detached form ("--no-walk X" as opposed to "--no-walk=X") + * not allowed, since the argument is optional. + */ + if (!strcmp(arg + 10, "sorted")) + revs->no_walk = REVISION_WALK_NO_WALK_SORTED; + else if (!strcmp(arg + 10, "unsorted")) + revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED; + else + return error("invalid argument to --no-walk"); } else if (!strcmp(arg, "--do-walk")) { revs->no_walk = 0; } else { @@ -2129,10 +2142,11 @@ int prepare_revision_walk(struct rev_info *revs) } e++; } - commit_list_sort_by_date(&revs->commits); if (!revs->leak_pending) free(list); + if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED) + commit_list_sort_by_date(&revs->commits); if (revs->no_walk) return 0; if (revs->limited) diff --git a/revision.h b/revision.h index cb5ab3513b..a95bd0b3f3 100644 --- a/revision.h +++ b/revision.h @@ -41,6 +41,10 @@ struct rev_cmdline_info { } *rev; }; +#define REVISION_WALK_WALK 0 +#define REVISION_WALK_NO_WALK_SORTED 1 +#define REVISION_WALK_NO_WALK_UNSORTED 2 + struct rev_info { /* Starting list */ struct commit_list *commits; @@ -62,7 +66,7 @@ struct rev_info { /* Traversal flags */ unsigned int dense:1, prune:1, - no_walk:1, + no_walk:2, show_all:1, remove_empty_trees:1, simplify_history:1, diff --git a/run-command.c b/run-command.c index f9922b9ecc..1101ef7237 100644 --- a/run-command.c +++ b/run-command.c @@ -53,13 +53,14 @@ static void mark_child_for_cleanup(pid_t pid) static void clear_child_for_cleanup(pid_t pid) { - struct child_to_clean **last, *p; + struct child_to_clean **pp; - last = &children_to_clean; - for (p = children_to_clean; p; p = p->next) { - if (p->pid == pid) { - *last = p->next; - free(p); + for (pp = &children_to_clean; *pp; pp = &(*pp)->next) { + struct child_to_clean *clean_me = *pp; + + if (clean_me->pid == pid) { + *pp = clean_me->next; + free(clean_me); return; } } diff --git a/sequencer.c b/sequencer.c index 1ea5293f6e..e3723d2095 100644 --- a/sequencer.c +++ b/sequencer.c @@ -17,7 +17,9 @@ #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION" -void remove_sequencer_state(void) +const char sign_off_header[] = "Signed-off-by: "; + +static void remove_sequencer_state(void) { struct strbuf seq_dir = STRBUF_INIT; @@ -233,6 +235,9 @@ static int do_recursive_merge(struct commit *base, struct commit *next, die(_("%s: Unable to write new index file"), action_name(opts)); rollback_lock_file(&index_lock); + if (opts->signoff) + append_signoff(msgbuf, 0); + if (!clean) { int i; strbuf_addstr(msgbuf, "\nConflicts:\n"); @@ -546,7 +551,11 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) static void prepare_revs(struct replay_opts *opts) { - if (opts->action != REPLAY_REVERT) + /* + * picking (but not reverting) ranges (but not individual revisions) + * should be done in reverse + */ + if (opts->action == REPLAY_PICK && !opts->revs->no_walk) opts->revs->reverse ^= 1; if (prepare_revision_walk(opts->revs)) @@ -1007,3 +1016,63 @@ int sequencer_pick_revisions(struct replay_opts *opts) save_opts(opts); return pick_commits(todo_list, opts); } + +static int ends_rfc2822_footer(struct strbuf *sb, int ignore_footer) +{ + int ch; + int hit = 0; + int i, j, k; + int len = sb->len - ignore_footer; + int first = 1; + const char *buf = sb->buf; + + for (i = len - 1; i > 0; i--) { + if (hit && buf[i] == '\n') + break; + hit = (buf[i] == '\n'); + } + + while (i < len - 1 && buf[i] == '\n') + i++; + + for (; i < len; i = k) { + for (k = i; k < len && buf[k] != '\n'; k++) + ; /* do nothing */ + k++; + + if ((buf[k] == ' ' || buf[k] == '\t') && !first) + continue; + + first = 0; + + for (j = 0; i + j < len; j++) { + ch = buf[i + j]; + if (ch == ':') + break; + if (isalnum(ch) || + (ch == '-')) + continue; + return 0; + } + } + return 1; +} + +void append_signoff(struct strbuf *msgbuf, int ignore_footer) +{ + struct strbuf sob = STRBUF_INIT; + int i; + + strbuf_addstr(&sob, sign_off_header); + strbuf_addstr(&sob, fmt_name(getenv("GIT_COMMITTER_NAME"), + getenv("GIT_COMMITTER_EMAIL"))); + strbuf_addch(&sob, '\n'); + for (i = msgbuf->len - 1 - ignore_footer; i > 0 && msgbuf->buf[i - 1] != '\n'; i--) + ; /* do nothing */ + if (prefixcmp(msgbuf->buf + i, sob.buf)) { + if (!i || !ends_rfc2822_footer(msgbuf, ignore_footer)) + strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, "\n", 1); + strbuf_splice(msgbuf, msgbuf->len - ignore_footer, 0, sob.buf, sob.len); + } + strbuf_release(&sob); +} diff --git a/sequencer.h b/sequencer.h index d8494201e0..9d57d57524 100644 --- a/sequencer.h +++ b/sequencer.h @@ -44,9 +44,10 @@ struct replay_opts { struct rev_info *revs; }; -/* Removes SEQ_DIR. */ -extern void remove_sequencer_state(void); - int sequencer_pick_revisions(struct replay_opts *opts); +extern const char sign_off_header[]; + +void append_signoff(struct strbuf *msgbuf, int ignore_footer); + #endif diff --git a/sha1-array.c b/sha1-array.c index b2f47f98fb..6f4a2246c9 100644 --- a/sha1-array.c +++ b/sha1-array.c @@ -14,7 +14,7 @@ static int void_hashcmp(const void *a, const void *b) return hashcmp(a, b); } -void sha1_array_sort(struct sha1_array *array) +static void sha1_array_sort(struct sha1_array *array) { qsort(array->sha1, array->nr, sizeof(*array->sha1), void_hashcmp); array->sorted = 1; diff --git a/sha1-array.h b/sha1-array.h index 4499b5dad4..72bb33bec6 100644 --- a/sha1-array.h +++ b/sha1-array.h @@ -11,7 +11,6 @@ struct sha1_array { #define SHA1_ARRAY_INIT { NULL, 0, 0, 0 } void sha1_array_append(struct sha1_array *array, const unsigned char *sha1); -void sha1_array_sort(struct sha1_array *array); int sha1_array_lookup(struct sha1_array *array, const unsigned char *sha1); void sha1_array_clear(struct sha1_array *array); @@ -445,8 +445,8 @@ static int is_rfc3986_unreserved(char ch) ch == '-' || ch == '_' || ch == '.' || ch == '~'; } -void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len, - int reserved) +static void strbuf_add_urlencode(struct strbuf *sb, const char *s, size_t len, + int reserved) { strbuf_grow(sb, len); while (len--) { @@ -465,15 +465,6 @@ void strbuf_addstr_urlencode(struct strbuf *sb, const char *s, strbuf_add_urlencode(sb, s, strlen(s), reserved); } -void strbuf_addf_ln(struct strbuf *sb, const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - strbuf_vaddf(sb, fmt, ap); - va_end(ap); - strbuf_addch(sb, '\n'); -} - int printf_ln(const char *fmt, ...) { int ret; @@ -99,8 +99,6 @@ __attribute__((format (printf,2,3))) extern void strbuf_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); -__attribute__((format (printf,2,3))) -extern void strbuf_addf_ln(struct strbuf *sb, const char *fmt, ...); extern void strbuf_add_lines(struct strbuf *sb, const char *prefix, const char *buf, size_t size); @@ -126,8 +124,6 @@ extern int launch_editor(const char *path, struct strbuf *buffer, const char *co extern int strbuf_branchname(struct strbuf *sb, const char *name); extern int strbuf_check_branch_ref(struct strbuf *sb, const char *name); -extern void strbuf_add_urlencode(struct strbuf *, const char *, size_t, - int reserved); extern void strbuf_addstr_urlencode(struct strbuf *, const char *, int reserved); diff --git a/submodule.c b/submodule.c index 19dc6a6c0d..50f213e926 100644 --- a/submodule.c +++ b/submodule.c @@ -588,13 +588,13 @@ static void calculate_changed_submodule_paths(void) initialized_fetch_ref_tips = 0; } -int fetch_populated_submodules(int num_options, const char **options, +int fetch_populated_submodules(const struct argv_array *options, const char *prefix, int command_line_option, int quiet) { - int i, result = 0, argc = 0, default_argc; + int i, result = 0; struct child_process cp; - const char **argv; + struct argv_array argv = ARGV_ARRAY_INIT; struct string_list_item *name_for_path; const char *work_tree = get_git_work_tree(); if (!work_tree) @@ -604,17 +604,13 @@ int fetch_populated_submodules(int num_options, const char **options, if (read_cache() < 0) die("index file corrupt"); - /* 6: "fetch" (options) --recurse-submodules-default default "--submodule-prefix" prefix NULL */ - argv = xcalloc(num_options + 6, sizeof(const char *)); - argv[argc++] = "fetch"; - for (i = 0; i < num_options; i++) - argv[argc++] = options[i]; - argv[argc++] = "--recurse-submodules-default"; - default_argc = argc++; - argv[argc++] = "--submodule-prefix"; + argv_array_push(&argv, "fetch"); + for (i = 0; i < options->argc; i++) + argv_array_push(&argv, options->argv[i]); + argv_array_push(&argv, "--recurse-submodules-default"); + /* default value, "--submodule-prefix" and its value are added later */ memset(&cp, 0, sizeof(cp)); - cp.argv = argv; cp.env = local_repo_env; cp.git_cmd = 1; cp.no_stdin = 1; @@ -674,16 +670,21 @@ int fetch_populated_submodules(int num_options, const char **options, if (!quiet) printf("Fetching submodule %s%s\n", prefix, ce->name); cp.dir = submodule_path.buf; - argv[default_argc] = default_argv; - argv[argc] = submodule_prefix.buf; + argv_array_push(&argv, default_argv); + argv_array_push(&argv, "--submodule-prefix"); + argv_array_push(&argv, submodule_prefix.buf); + cp.argv = argv.argv; if (run_command(&cp)) result = 1; + argv_array_pop(&argv); + argv_array_pop(&argv); + argv_array_pop(&argv); } strbuf_release(&submodule_path); strbuf_release(&submodule_git_dir); strbuf_release(&submodule_prefix); } - free(argv); + argv_array_clear(&argv); out: string_list_clear(&changed_submodule_paths, 1); return result; @@ -788,7 +789,7 @@ static int find_first_merges(struct object_array *result, const char *path, die("revision walk setup failed"); while ((commit = get_revision(&revs)) != NULL) { struct object *o = &(commit->object); - if (in_merge_bases(b, &commit, 1)) + if (in_merge_bases(b, commit)) add_object_array(o, NULL, &merges); } reset_revision_walk(); @@ -803,7 +804,7 @@ static int find_first_merges(struct object_array *result, const char *path, contains_another = 0; for (j = 0; j < merges.nr; j++) { struct commit *m2 = (struct commit *) merges.objects[j].item; - if (i != j && in_merge_bases(m2, &m1, 1)) { + if (i != j && in_merge_bases(m2, m1)) { contains_another = 1; break; } @@ -865,18 +866,18 @@ int merge_submodule(unsigned char result[20], const char *path, } /* check whether both changes are forward */ - if (!in_merge_bases(commit_base, &commit_a, 1) || - !in_merge_bases(commit_base, &commit_b, 1)) { + if (!in_merge_bases(commit_base, commit_a) || + !in_merge_bases(commit_base, commit_b)) { MERGE_WARNING(path, "commits don't follow merge-base"); return 0; } /* Case #1: a is contained in b or vice versa */ - if (in_merge_bases(commit_a, &commit_b, 1)) { + if (in_merge_bases(commit_a, commit_b)) { hashcpy(result, b); return 1; } - if (in_merge_bases(commit_b, &commit_a, 1)) { + if (in_merge_bases(commit_b, commit_a)) { hashcpy(result, a); return 1; } diff --git a/submodule.h b/submodule.h index e105b0ebe6..594b50d510 100644 --- a/submodule.h +++ b/submodule.h @@ -2,6 +2,7 @@ #define SUBMODULE_H struct diff_options; +struct argv_array; enum { RECURSE_SUBMODULES_ON_DEMAND = -1, @@ -23,7 +24,7 @@ void show_submodule_summary(FILE *f, const char *path, const char *del, const char *add, const char *reset); void set_config_fetch_recurse_submodules(int value); void check_for_new_submodule_commits(unsigned char new_sha1[20]); -int fetch_populated_submodules(int num_options, const char **options, +int fetch_populated_submodules(const struct argv_array *options, const char *prefix, int command_line_option, int quiet); unsigned is_submodule_modified(const char *path, int ignore_untracked); diff --git a/symlinks.c b/symlinks.c index 290036744b..c2b41a8501 100644 --- a/symlinks.c +++ b/symlinks.c @@ -1,5 +1,8 @@ #include "cache.h" +static int threaded_check_leading_path(struct cache_def *cache, const char *name, int len); +static int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len); + /* * Returns the length (on a path component basis) of the longest * common prefix match of 'name_a' and 'name_b'. @@ -231,7 +234,7 @@ int check_leading_path(const char *name, int len) * Return path length if leading path exists and is neither a * directory nor a symlink. */ -int threaded_check_leading_path(struct cache_def *cache, const char *name, int len) +static int threaded_check_leading_path(struct cache_def *cache, const char *name, int len) { int flags; int match_len = lstat_cache_matchlen(cache, name, len, &flags, @@ -263,7 +266,7 @@ int has_dirs_only_path(const char *name, int len, int prefix_len) * 'prefix_len', thus we then allow for symlinks in the prefix part as * long as those points to real existing directories. */ -int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len) +static int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len) { return lstat_cache(cache, name, len, FL_DIR|FL_FULLPATH, prefix_len) & diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index d748c36df5..7061dce7e5 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -26,9 +26,10 @@ testid=${this_test#t} git_p4_test_start=9800 P4DPORT=$((10669 + ($testid - $git_p4_test_start))) -export P4PORT=localhost:$P4DPORT -export P4CLIENT=client -export P4EDITOR=: +P4PORT=localhost:$P4DPORT +P4CLIENT=client +P4EDITOR=: +export P4PORT P4CLIENT P4EDITOR db="$TRASH_DIRECTORY/db" cli=$(test-path-utils real_path "$TRASH_DIRECTORY/cli") diff --git a/t/perf/.gitignore b/t/perf/.gitignore index 50f5cc1ed9..982eb8e3a9 100644 --- a/t/perf/.gitignore +++ b/t/perf/.gitignore @@ -1,2 +1,3 @@ -build/ -test-results/ +/build/ +/test-results/ +/trash directory*/ diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh index ccb5435b2a..ae6a3f0777 100755 --- a/t/t0000-basic.sh +++ b/t/t0000-basic.sh @@ -450,24 +450,6 @@ test_expect_success 'update-index D/F conflict' ' test $numpath0 = 1 ' -test_expect_success SYMLINKS 'real path works as expected' ' - mkdir first && - ln -s ../.git first/.git && - mkdir second && - ln -s ../first second/other && - mkdir third && - dir="$(cd .git; pwd -P)" && - dir2=third/../second/other/.git && - test "$dir" = "$(test-path-utils real_path $dir2)" && - file="$dir"/index && - test "$file" = "$(test-path-utils real_path $dir2/index)" && - basename=blub && - test "$dir/$basename" = "$(cd .git && test-path-utils real_path "$basename")" && - ln -s ../first/file .git/syml && - sym="$(cd first; pwd -P)"/file && - test "$sym" = "$(test-path-utils real_path "$dir2/syml")" -' - test_expect_success 'very long name in the index handled sanely' ' a=a && # 1 diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh index 53cf1f8dc4..4ef2345982 100755 --- a/t/t0060-path-utils.sh +++ b/t/t0060-path-utils.sh @@ -139,4 +139,63 @@ test_expect_success 'strip_path_suffix' ' test c:/msysgit = $(test-path-utils strip_path_suffix \ c:/msysgit/libexec//git-core libexec/git-core) ' + +test_expect_success 'absolute path rejects the empty string' ' + test_must_fail test-path-utils absolute_path "" +' + +test_expect_success 'real path rejects the empty string' ' + test_must_fail test-path-utils real_path "" +' + +test_expect_success POSIX 'real path works on absolute paths 1' ' + nopath="hopefully-absent-path" && + test "/" = "$(test-path-utils real_path "/")" && + test "/$nopath" = "$(test-path-utils real_path "/$nopath")" +' + +test_expect_success 'real path works on absolute paths 2' ' + nopath="hopefully-absent-path" && + # Find an existing top-level directory for the remaining tests: + d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") && + test "$d" = "$(test-path-utils real_path "$d")" && + test "$d/$nopath" = "$(test-path-utils real_path "$d/$nopath")" +' + +test_expect_success POSIX 'real path removes extra leading slashes' ' + nopath="hopefully-absent-path" && + test "/" = "$(test-path-utils real_path "///")" && + test "/$nopath" = "$(test-path-utils real_path "///$nopath")" && + # Find an existing top-level directory for the remaining tests: + d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") && + test "$d" = "$(test-path-utils real_path "//$d")" && + test "$d/$nopath" = "$(test-path-utils real_path "//$d/$nopath")" +' + +test_expect_success 'real path removes other extra slashes' ' + nopath="hopefully-absent-path" && + # Find an existing top-level directory for the remaining tests: + d=$(pwd -P | sed -e "s|^\([^/]*/[^/]*\)/.*|\1|") && + test "$d" = "$(test-path-utils real_path "$d///")" && + test "$d/$nopath" = "$(test-path-utils real_path "$d///$nopath")" +' + +test_expect_success SYMLINKS 'real path works on symlinks' ' + mkdir first && + ln -s ../.git first/.git && + mkdir second && + ln -s ../first second/other && + mkdir third && + dir="$(cd .git; pwd -P)" && + dir2=third/../second/other/.git && + test "$dir" = "$(test-path-utils real_path $dir2)" && + file="$dir"/index && + test "$file" = "$(test-path-utils real_path $dir2/index)" && + basename=blub && + test "$dir/$basename" = "$(cd .git && test-path-utils real_path "$basename")" && + ln -s ../first/file .git/syml && + sym="$(cd first; pwd -P)"/file && + test "$sym" = "$(test-path-utils real_path "$dir2/syml")" +' + test_done diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh index 9bee8bfd2e..da2c504e53 100755 --- a/t/t0070-fundamental.sh +++ b/t/t0070-fundamental.sh @@ -25,4 +25,9 @@ test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' ' grep "cannotwrite/test" err ' +test_expect_success 'check for a bug in the regex routines' ' + # if this test fails, re-build git with NO_REGEX=1 + test-regex +' + test_done diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 1ffce2173e..79c8d0142e 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -369,6 +369,76 @@ test_expect_success \ 'git tag foobar && test_must_fail git branch --track my11 foobar' +test_expect_success 'use --set-upstream-to modify HEAD' \ + 'test_config branch.master.remote foo && + test_config branch.master.merge foo && + git branch my12 + git branch --set-upstream-to my12 && + test "$(git config branch.master.remote)" = "." && + test "$(git config branch.master.merge)" = "refs/heads/my12"' + +test_expect_success 'use --set-upstream-to modify a particular branch' \ + 'git branch my13 + git branch --set-upstream-to master my13 && + test "$(git config branch.my13.remote)" = "." && + test "$(git config branch.my13.merge)" = "refs/heads/master"' + +test_expect_success '--unset-upstream should fail if given a non-existent branch' \ + 'test_must_fail git branch --unset-upstream i-dont-exist' + +test_expect_success 'test --unset-upstream on HEAD' \ + 'git branch my14 + test_config branch.master.remote foo && + test_config branch.master.merge foo && + git branch --set-upstream-to my14 && + git branch --unset-upstream && + test_must_fail git config branch.master.remote && + test_must_fail git config branch.master.merge && + # fail for a branch without upstream set + test_must_fail git branch --unset-upstream +' + +test_expect_success 'test --unset-upstream on a particular branch' \ + 'git branch my15 + git branch --set-upstream-to master my14 && + git branch --unset-upstream my14 && + test_must_fail git config branch.my14.remote && + test_must_fail git config branch.my14.merge' + +test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' \ + 'git update-ref refs/remotes/origin/master HEAD && + git branch --set-upstream origin/master 2>actual && + test_when_finished git update-ref -d refs/remotes/origin/master && + test_when_finished git branch -d origin/master && + cat >expected <<EOF && +The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to + +If you wanted to make '"'master'"' track '"'origin/master'"', do this: + + git branch -d origin/master + git branch --set-upstream-to origin/master +EOF + test_cmp expected actual +' + +test_expect_success '--set-upstream with two args only shows the deprecation message' \ + 'git branch --set-upstream master my13 2>actual && + test_when_finished git branch --unset-upstream master && + cat >expected <<EOF && +The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to +EOF + test_cmp expected actual +' + +test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' \ + 'git branch --set-upstream my13 2>actual && + test_when_finished git branch --unset-upstream my13 && + cat >expected <<EOF && +The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to +EOF + test_cmp expected actual +' + # Keep this test last, as it changes the current branch cat >expect <<EOF $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh index 1f35e55ee3..7480d6e7c2 100755 --- a/t/t3300-funny-names.sh +++ b/t/t3300-funny-names.sh @@ -11,6 +11,16 @@ tree, index, and tree objects. . ./test-lib.sh +HT=' ' + +echo 2>/dev/null > "Name with an${HT}HT" +if ! test -f "Name with an${HT}HT" +then + # since FAT/NTFS does not allow tabs in filenames, skip this test + skip_all='Your filesystem does not allow tabs in filenames' + test_done +fi + p0='no-funny' p1='tabs ," (dq) and spaces' p2='just space' @@ -23,21 +33,9 @@ test_expect_success 'setup' ' EOF { cat "$p0" >"$p1" || :; } && - { echo "Foo Bar Baz" >"$p2" || :; } && - - if test -f "$p1" && cmp "$p0" "$p1" - then - test_set_prereq TABS_IN_FILENAMES - fi + { echo "Foo Bar Baz" >"$p2" || :; } ' -if ! test_have_prereq TABS_IN_FILENAMES -then - # since FAT/NTFS does not allow tabs in filenames, skip this test - skip_all='Your filesystem does not allow tabs in filenames' - test_done -fi - test_expect_success 'setup: populate index and tree' ' git update-index --add "$p0" "$p2" && t0=$(git write-tree) diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh index 0c81b3c427..c82f7210c4 100755 --- a/t/t3507-cherry-pick-conflict.sh +++ b/t/t3507-cherry-pick-conflict.sh @@ -30,6 +30,7 @@ test_expect_success setup ' test_commit initial foo a && test_commit base foo b && test_commit picked foo c && + test_commit --signoff picked-signed foo d && git config advice.detachedhead false ' @@ -340,4 +341,35 @@ test_expect_success 'revert conflict, diff3 -m style' ' test_cmp expected actual ' +test_expect_success 'failed cherry-pick does not forget -s' ' + pristine_detach initial && + test_must_fail git cherry-pick -s picked && + test_i18ngrep -e "Signed-off-by" .git/MERGE_MSG +' + +test_expect_success 'commit after failed cherry-pick does not add duplicated -s' ' + pristine_detach initial && + test_must_fail git cherry-pick -s picked-signed && + git commit -a -s && + test $(git show -s |grep -c "Signed-off-by") = 1 +' + +test_expect_success 'commit after failed cherry-pick adds -s at the right place' ' + pristine_detach initial && + test_must_fail git cherry-pick picked && + git commit -a -s && + pwd && + cat <<EOF > expected && +picked + +Signed-off-by: C O Mitter <committer@example.com> + +Conflicts: + foo +EOF + + git show -s --pretty=format:%B > actual && + test_cmp expected actual +' + test_done diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 75f7ff4f2f..340afc760d 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -44,6 +44,21 @@ test_expect_success 'cherry-pick first..fourth works' ' check_head_differs_from fourth ' +test_expect_success 'cherry-pick three one two works' ' + git checkout -f first && + test_commit one && + test_commit two && + test_commit three && + git checkout -f master && + git reset --hard first && + git cherry-pick three one two && + git diff --quiet three && + git diff --quiet HEAD three && + test "$(git log --reverse --format=%s first..)" = "three +one +two" +' + test_expect_success 'output to keep user entertained during multi-pick' ' cat <<-\EOF >expected && [master OBJID] second diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index f4e6450d6a..b5fb527b2e 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -410,7 +410,7 @@ test_expect_success '--continue respects -x in first commit in multi-pick' ' grep "cherry picked from.*$picked" msg ' -test_expect_success '--signoff is not automatically propagated to resolved conflict' ' +test_expect_failure '--signoff is automatically propagated to resolved conflict' ' pristine_detach initial && test_expect_code 1 git cherry-pick --signoff base..anotherpick && echo "c" >foo && @@ -428,7 +428,7 @@ test_expect_success '--signoff is not automatically propagated to resolved confl grep "Signed-off-by:" anotherpick_msg ' -test_expect_success '--signoff dropped for implicit commit of resolution, multi-pick case' ' +test_expect_failure '--signoff dropped for implicit commit of resolution, multi-pick case' ' pristine_detach initial && test_must_fail git cherry-pick -s picked anotherpick && echo c >foo && @@ -441,7 +441,7 @@ test_expect_success '--signoff dropped for implicit commit of resolution, multi- ! grep Signed-off-by: msg ' -test_expect_success 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' ' +test_expect_failure 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' ' pristine_detach initial && test_must_fail git cherry-pick -s picked && echo c >foo && diff --git a/t/t3902-quoted.sh b/t/t3902-quoted.sh index 534ee08a44..892f567844 100755 --- a/t/t3902-quoted.sh +++ b/t/t3902-quoted.sh @@ -16,9 +16,8 @@ echo foo 2>/dev/null > "Name and an${HT}HT" if ! test -f "Name and an${HT}HT" then # FAT/NTFS does not allow tabs in filenames - say 'Your filesystem does not allow tabs in filenames' -else - test_set_prereq TABS_IN_FILENAMES + skip_all='Your filesystem does not allow tabs in filenames' + test_done fi for_each_name () { @@ -31,7 +30,7 @@ for_each_name () { done } -test_expect_success TABS_IN_FILENAMES 'setup' ' +test_expect_success 'setup' ' mkdir "$FN" && for_each_name "echo initial >\"\$name\"" && @@ -45,7 +44,7 @@ test_expect_success TABS_IN_FILENAMES 'setup' ' ' -test_expect_success TABS_IN_FILENAMES 'setup expected files' ' +test_expect_success 'setup expected files' ' cat >expect.quoted <<\EOF && Name "Name and a\nLF" @@ -75,74 +74,74 @@ With SP in it EOF ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' ' +test_expect_success 'check fully quoted output from ls-files' ' git ls-files >current && test_cmp expect.quoted current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' ' +test_expect_success 'check fully quoted output from diff-files' ' git diff --name-only >current && test_cmp expect.quoted current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' ' +test_expect_success 'check fully quoted output from diff-index' ' git diff --name-only HEAD >current && test_cmp expect.quoted current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' ' +test_expect_success 'check fully quoted output from diff-tree' ' git diff --name-only HEAD^ HEAD >current && test_cmp expect.quoted current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' ' +test_expect_success 'check fully quoted output from ls-tree' ' git ls-tree --name-only -r HEAD >current && test_cmp expect.quoted current ' -test_expect_success TABS_IN_FILENAMES 'setting core.quotepath' ' +test_expect_success 'setting core.quotepath' ' git config --bool core.quotepath false ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-files' ' +test_expect_success 'check fully quoted output from ls-files' ' git ls-files >current && test_cmp expect.raw current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-files' ' +test_expect_success 'check fully quoted output from diff-files' ' git diff --name-only >current && test_cmp expect.raw current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-index' ' +test_expect_success 'check fully quoted output from diff-index' ' git diff --name-only HEAD >current && test_cmp expect.raw current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from diff-tree' ' +test_expect_success 'check fully quoted output from diff-tree' ' git diff --name-only HEAD^ HEAD >current && test_cmp expect.raw current ' -test_expect_success TABS_IN_FILENAMES 'check fully quoted output from ls-tree' ' +test_expect_success 'check fully quoted output from ls-tree' ' git ls-tree --name-only -r HEAD >current && test_cmp expect.raw current diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh index 97b81778cb..cd543ecc54 100755 --- a/t/t4016-diff-quote.sh +++ b/t/t4016-diff-quote.sh @@ -13,14 +13,12 @@ P1='pathname with HT' P2='pathname with SP' P3='pathname with LF' -if : 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" -then - test_set_prereq TABS_IN_FILENAMES -else - say 'Your filesystem does not allow tabs in filenames' -fi +echo 2>/dev/null >"$P1" && test -f "$P1" && rm -f "$P1" || { + skip_all='Your filesystem does not allow tabs in filenames' + test_done +} -test_expect_success TABS_IN_FILENAMES setup ' +test_expect_success setup ' echo P0.0 >"$P0.0" && echo P0.1 >"$P0.1" && echo P0.2 >"$P0.2" && @@ -40,7 +38,7 @@ test_expect_success TABS_IN_FILENAMES setup ' : ' -test_expect_success TABS_IN_FILENAMES 'setup expected files' ' +test_expect_success 'setup expected files' ' cat >expect <<\EOF rename pathname.1 => "Rpathname\twith HT.0" (100%) rename pathname.3 => "Rpathname\nwith LF.0" (100%) @@ -52,12 +50,12 @@ cat >expect <<\EOF EOF ' -test_expect_success TABS_IN_FILENAMES 'git diff --summary -M HEAD' ' +test_expect_success 'git diff --summary -M HEAD' ' git diff --summary -M HEAD >actual && test_cmp expect actual ' -test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' ' +test_expect_success 'git diff --numstat -M HEAD' ' cat >expect <<-\EOF && 0 0 pathname.1 => "Rpathname\twith HT.0" 0 0 pathname.3 => "Rpathname\nwith LF.0" @@ -71,7 +69,7 @@ test_expect_success TABS_IN_FILENAMES 'git diff --numstat -M HEAD' ' test_cmp expect actual ' -test_expect_success TABS_IN_FILENAMES 'git diff --stat -M HEAD' ' +test_expect_success 'git diff --stat -M HEAD' ' cat >expect <<-\EOF && pathname.1 => "Rpathname\twith HT.0" | 0 pathname.3 => "Rpathname\nwith LF.0" | 0 diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 0baaad2a24..924ba536ca 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -178,11 +178,21 @@ test_expect_success 'git log --no-walk <commits> sorts by commit time' ' test_cmp expect actual ' +test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' ' + git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual && + test_cmp expect actual +' + cat > expect << EOF 5d31159 fourth 804a787 sixth 394ef78 fifth EOF +test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' ' + git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual && + test_cmp expect actual +' + test_expect_success 'git show <commits> leaves list of commits as given' ' git show --oneline -s 5d31159 804a787 394ef78 > actual && test_cmp expect actual diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index 88a21ff0bf..ccc55ebf4b 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -131,7 +131,7 @@ EOF } && git tag footag && git config --add remote.oops.fetch "+refs/*:refs/*" && - git remote rm oops 2>actual1 && + git remote remove oops 2>actual1 && git branch foobranch && git config --add remote.oops.fetch "+refs/*:refs/*" && git remote rm oops 2>actual2 && @@ -678,7 +678,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' ' git clone one five && origin_url=$(pwd)/one && (cd five && - git remote rm origin && + git remote remove origin && mkdir -p .git/remotes && cat ../remotes_origin > .git/remotes/origin && git remote rename origin origin && diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh index 227dd56137..0f8140957f 100755 --- a/t/t5514-fetch-multiple.sh +++ b/t/t5514-fetch-multiple.sh @@ -151,4 +151,34 @@ test_expect_success 'git fetch --multiple (ignoring skipFetchAll)' ' test_cmp ../expect output) ' +test_expect_success 'git fetch --all --no-tags' ' + >expect && + git clone one test5 && + git clone test5 test6 && + (cd test5 && git tag test-tag) && + ( + cd test6 && + git fetch --all --no-tags && + git tag >output + ) && + test_cmp expect test6/output +' + +test_expect_success 'git fetch --all --tags' ' + echo test-tag >expect && + git clone one test7 && + git clone test7 test8 && + ( + cd test7 && + test_commit test-tag && + git reset --hard HEAD^ + ) && + ( + cd test8 && + git fetch --all --tags && + git tag >output + ) && + test_cmp expect test8/output +' + test_done diff --git a/t/t5540-http-push.sh b/t/t5540-http-push.sh index f141f2d1da..01d0d95b4d 100755 --- a/t/t5540-http-push.sh +++ b/t/t5540-http-push.sh @@ -109,7 +109,7 @@ test_expect_success 'http-push fetches packed objects' ' # By reset, we force git to retrieve the packed object (cd "$ROOT_PATH"/test_repo_clone_packed && git reset --hard HEAD^ && - git remote rm origin && + git remote remove origin && git reflog expire --expire=0 --all && git prune && git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master) diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh index 2cf42c73f1..3889eca4ae 100755 --- a/t/t6037-merge-ours-theirs.sh +++ b/t/t6037-merge-ours-theirs.sh @@ -53,7 +53,19 @@ test_expect_success 'recursive favouring ours' ' ! grep 1 file ' -test_expect_success 'pull with -X' ' +test_expect_success 'binary file with -Xours/-Xtheirs' ' + echo file binary >.gitattributes && + + git reset --hard master && + git merge -s recursive -X theirs side && + git diff --exit-code side HEAD -- file && + + git reset --hard master && + git merge -s recursive -X ours side && + git diff --exit-code master HEAD -- file +' + +test_expect_success 'pull passes -X to underlying merge' ' git reset --hard master && git pull -s recursive -Xours . side && git reset --hard master && git pull -s recursive -X ours . side && git reset --hard master && git pull -s recursive -Xtheirs . side && diff --git a/t/t7007-show.sh b/t/t7007-show.sh index a40cd3630c..e41fa00b80 100755 --- a/t/t7007-show.sh +++ b/t/t7007-show.sh @@ -108,4 +108,16 @@ test_expect_success 'showing range' ' test_cmp expect actual.filtered ' +test_expect_success '-s suppresses diff' ' + echo main3 >expect && + git show -s --format=%s main3 >actual && + test_cmp expect actual +' + +test_expect_success '--quiet suppresses diff' ' + echo main3 >expect && + git show --quiet --format=%s main3 >actual && + test_cmp expect actual +' + test_done diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 35d357d4c8..91db352cc7 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -502,31 +502,41 @@ test_expect_success 'log grep setup' ' test_expect_success 'log grep (1)' ' git log --author=author --pretty=tformat:%s >actual && - ( echo third ; echo initial ) >expect && + { + echo third && echo initial + } >expect && test_cmp expect actual ' test_expect_success 'log grep (2)' ' git log --author=" * " -F --pretty=tformat:%s >actual && - ( echo second ) >expect && + { + echo second + } >expect && test_cmp expect actual ' test_expect_success 'log grep (3)' ' git log --author="^A U" --pretty=tformat:%s >actual && - ( echo third ; echo initial ) >expect && + { + echo third && echo initial + } >expect && test_cmp expect actual ' test_expect_success 'log grep (4)' ' git log --author="frotz\.com>$" --pretty=tformat:%s >actual && - ( echo second ) >expect && + { + echo second + } >expect && test_cmp expect actual ' test_expect_success 'log grep (5)' ' git log --author=Thor -F --pretty=tformat:%s >actual && - ( echo third ; echo initial ) >expect && + { + echo third && echo initial + } >expect && test_cmp expect actual ' @@ -536,11 +546,19 @@ test_expect_success 'log grep (6)' ' test_cmp expect actual ' -test_expect_success 'log --grep --author implicitly uses all-match' ' - # grep matches initial and second but not third - # author matches only initial and third - git log --author="A U Thor" --grep=s --grep=l --format=%s >actual && - echo initial >expect && +test_expect_success 'log with multiple --grep uses union' ' + git log --grep=i --grep=r --format=%s >actual && + { + echo fourth && echo third && echo initial + } >expect && + test_cmp expect actual +' + +test_expect_success 'log --all-match with multiple --grep uses intersection' ' + git log --all-match --grep=i --grep=r --format=%s >actual && + { + echo third + } >expect && test_cmp expect actual ' @@ -552,7 +570,47 @@ test_expect_success 'log with multiple --author uses union' ' test_cmp expect actual ' -test_expect_success 'log with --grep and multiple --author uses all-match' ' +test_expect_success 'log --all-match with multiple --author still uses union' ' + git log --all-match --author="Thor" --author="Aster" --format=%s >actual && + { + echo third && echo second && echo initial + } >expect && + test_cmp expect actual +' + +test_expect_success 'log --grep --author uses intersection' ' + # grep matches only third and fourth + # author matches only initial and third + git log --author="A U Thor" --grep=r --format=%s >actual && + { + echo third + } >expect && + test_cmp expect actual +' + +test_expect_success 'log --grep --grep --author takes union of greps and intersects with author' ' + # grep matches initial and second but not third + # author matches only initial and third + git log --author="A U Thor" --grep=s --grep=l --format=%s >actual && + { + echo initial + } >expect && + test_cmp expect actual +' + +test_expect_success 'log ---all-match -grep --author --author still takes union of authors and intersects with grep' ' + # grep matches only initial and third + # author matches all but second + git log --all-match --author="Thor" --author="Night" --grep=i --format=%s >actual && + { + echo third && echo initial + } >expect && + test_cmp expect actual +' + +test_expect_success 'log --grep --author --author takes union of authors and intersects with grep' ' + # grep matches only initial and third + # author matches all but second git log --author="Thor" --author="Night" --grep=i --format=%s >actual && { echo third && echo initial @@ -560,9 +618,13 @@ test_expect_success 'log with --grep and multiple --author uses all-match' ' test_cmp expect actual ' -test_expect_success 'log with --grep and multiple --author uses all-match' ' - git log --author="Thor" --author="Night" --grep=q --format=%s >actual && - >expect && +test_expect_success 'log --all-match --grep --grep --author takes intersection' ' + # grep matches only third + # author matches only initial and third + git log --all-match --author="A U Thor" --grep=i --grep=r --format=%s >actual && + { + echo third + } >expect && test_cmp expect actual ' diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh index ba19ac127e..9c353ab222 100755 --- a/t/t8004-blame-with-conflicts.sh +++ b/t/t8004-blame-with-conflicts.sh @@ -66,7 +66,7 @@ test_expect_success \ git blame file2 ' -test_expect_success 'blame runs on conflicted file in stages 1,3' ' +test_expect_success 'blame does not crash with conflicted file in stages 1,3' ' git blame file1 ' diff --git a/t/t9805-git-p4-skip-submit-edit.sh b/t/t9805-git-p4-skip-submit-edit.sh index fb3c8ec12c..ff2cc79701 100755 --- a/t/t9805-git-p4-skip-submit-edit.sh +++ b/t/t9805-git-p4-skip-submit-edit.sh @@ -38,7 +38,7 @@ test_expect_success 'no config, unedited, say no' ' cd "$git" && echo line >>file1 && git commit -a -m "change 3 (not really)" && - printf "bad response\nn\n" | git p4 submit && + printf "bad response\nn\n" | test_expect_code 1 git p4 submit && p4 changes //depot/... >wc && test_line_count = 2 wc ) diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 9394fd4e9b..0ae048f29f 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -54,6 +54,47 @@ test_expect_success 'submit --origin' ' ) ' +test_expect_success 'submit --dry-run' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + test_commit "dry-run1" && + test_commit "dry-run2" && + git p4 submit --dry-run >out && + test_i18ngrep "Would apply" out + ) && + ( + cd "$cli" && + test_path_is_missing "dry-run1.t" && + test_path_is_missing "dry-run2.t" + ) +' + +test_expect_success 'submit --dry-run --export-labels' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + echo dry-run1 >dry-run1 && + git add dry-run1 && + git commit -m "dry-run1" dry-run1 && + git config git-p4.skipSubmitEdit true && + git p4 submit && + echo dry-run2 >dry-run2 && + git add dry-run2 && + git commit -m "dry-run2" dry-run2 && + git tag -m "dry-run-tag1" dry-run-tag1 HEAD^ && + git p4 submit --dry-run --export-labels >out && + test_i18ngrep "Would create p4 label" out + ) && + ( + cd "$cli" && + test_path_is_file "dry-run1" && + test_path_is_missing "dry-run2" + ) +' + test_expect_success 'submit with allowSubmit' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && @@ -334,6 +375,30 @@ test_expect_success 'description with Jobs section and bogus following text' ' make_job $(cat jobname) && test_must_fail git p4 submit 2>err && test_i18ngrep "Unknown field name" err + ) && + ( + cd "$cli" && + p4 revert desc6 && + rm desc6 + ) +' + +test_expect_success 'submit --prepare-p4-only' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + echo prep-only-add >prep-only-add && + git add prep-only-add && + git commit -m "prep only add" && + git p4 submit --prepare-p4-only >out && + test_i18ngrep "prepared for submission" out && + test_i18ngrep "must be deleted" out + ) && + ( + cd "$cli" && + test_path_is_file prep-only-add && + p4 fstat -T action prep-only-add | grep -w add ) ' diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh index e9daa9c4f6..fe30ad881f 100755 --- a/t/t9810-git-p4-rcs.sh +++ b/t/t9810-git-p4-rcs.sh @@ -160,9 +160,6 @@ test_expect_success 'cleanup after failure' ' # the cli file so that submit will get a conflict. Make sure that # scrubbing doesn't make a mess of things. # -# Assumes that git-p4 exits leaving the p4 file open, with the -# conflict-generating patch unapplied. -# # This might happen only if the git repo is behind the p4 repo at # submit time, and there is a conflict. # @@ -181,14 +178,11 @@ test_expect_success 'do not scrub plain text' ' sed -i "s/^line5/line5 p4 edit/" file_text && p4 submit -d "file5 p4 edit" ) && - ! git p4 submit && + echo s | test_expect_code 1 git p4 submit && ( - # exepct something like: - # file_text - file(s) not opened on this client - # but not copious diff output + # make sure the file is not left open cd "$cli" && - p4 diff file_text >wc && - test_line_count = 1 wc + ! p4 fstat -T action file_text ) ) ' @@ -343,44 +337,6 @@ test_expect_failure 'Add keywords in git which do not match the default p4 value ) ' -# Check that the existing merge conflict handling still works. -# Modify kwfile1.c in git, and delete in p4. We should be able -# to skip the git commit. -# -test_expect_success 'merge conflict handling still works' ' - test_when_finished cleanup_git && - ( - cd "$cli" && - echo "Hello:\$Id\$" >merge2.c && - echo "World" >>merge2.c && - p4 add -t ktext merge2.c && - p4 submit -d "add merge test file" - ) && - git p4 clone --dest="$git" //depot && - ( - cd "$git" && - sed -e "/Hello/d" merge2.c >merge2.c.tmp && - mv merge2.c.tmp merge2.c && - git add merge2.c && - git commit -m "Modifying merge2.c" - ) && - ( - cd "$cli" && - p4 delete merge2.c && - p4 submit -d "remove merge test file" - ) && - ( - cd "$git" && - test -f merge2.c && - git config git-p4.skipSubmitEdit true && - git config git-p4.attemptRCSCleanup true && - !(echo "s" | git p4 submit) && - git rebase --skip && - ! test -f merge2.c - ) -' - - test_expect_success 'kill p4d' ' kill_p4d ' diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh new file mode 100755 index 0000000000..d2b7b3d98d --- /dev/null +++ b/t/t9815-git-p4-submit-fail.sh @@ -0,0 +1,429 @@ +#!/bin/sh + +test_description='git p4 submit failure handling' + +. ./lib-git-p4.sh + +test_expect_success 'start p4d' ' + start_p4d +' + +test_expect_success 'init depot' ' + ( + cd "$cli" && + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && + echo line1 >file1 && + p4 add file1 && + p4 submit -d "line1 in file1" + ) +' + +test_expect_success 'conflict on one commit' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line2 >>file1 && + p4 submit -d "line2 in file1" + ) && + ( + # now this commit should cause a conflict + cd "$git" && + git config git-p4.skipSubmitEdit true && + echo line3 >>file1 && + git add file1 && + git commit -m "line3 in file1 will conflict" && + test_expect_code 1 git p4 submit >out && + test_i18ngrep "No commits applied" out + ) +' + +test_expect_success 'conflict on second of two commits' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line3 >>file1 && + p4 submit -d "line3 in file1" + ) && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # this commit is okay + test_commit "first_commit_okay" && + # now this submit should cause a conflict + echo line4 >>file1 && + git add file1 && + git commit -m "line4 in file1 will conflict" && + test_expect_code 1 git p4 submit >out && + test_i18ngrep "Applied only the commits" out + ) +' + +test_expect_success 'conflict on first of two commits, skip' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line4 >>file1 && + p4 submit -d "line4 in file1" + ) && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # this submit should cause a conflict + echo line5 >>file1 && + git add file1 && + git commit -m "line5 in file1 will conflict" && + # but this commit is okay + test_commit "okay_commit_after_skip" && + echo s | test_expect_code 1 git p4 submit >out && + test_i18ngrep "Applied only the commits" out + ) +' + +test_expect_success 'conflict on first of two commits, quit' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line7 >>file1 && + p4 submit -d "line7 in file1" + ) && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # this submit should cause a conflict + echo line8 >>file1 && + git add file1 && + git commit -m "line8 in file1 will conflict" && + # but this commit is okay + test_commit "okay_commit_after_quit" && + echo q | test_expect_code 1 git p4 submit >out && + test_i18ngrep "No commits applied" out + ) +' + +test_expect_success 'conflict cli and config options' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + git p4 submit --conflict=ask && + git p4 submit --conflict=skip && + git p4 submit --conflict=quit && + test_expect_code 2 git p4 submit --conflict=foo && + test_expect_code 2 git p4 submit --conflict && + git config git-p4.conflict foo && + test_expect_code 1 git p4 submit && + git config --unset git-p4.conflict && + git p4 submit + ) +' + +test_expect_success 'conflict on first of two commits, --conflict=skip' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line9 >>file1 && + p4 submit -d "line9 in file1" + ) && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # this submit should cause a conflict + echo line10 >>file1 && + git add file1 && + git commit -m "line10 in file1 will conflict" && + # but this commit is okay + test_commit "okay_commit_after_auto_skip" && + test_expect_code 1 git p4 submit --conflict=skip >out && + test_i18ngrep "Applied only the commits" out + ) +' + +test_expect_success 'conflict on first of two commits, --conflict=quit' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$cli" && + p4 open file1 && + echo line11 >>file1 && + p4 submit -d "line11 in file1" + ) && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # this submit should cause a conflict + echo line12 >>file1 && + git add file1 && + git commit -m "line12 in file1 will conflict" && + # but this commit is okay + test_commit "okay_commit_after_auto_quit" && + test_expect_code 1 git p4 submit --conflict=quit >out && + test_i18ngrep "No commits applied" out + ) +' + +# +# Cleanup after submit fail, all cases. Some modifications happen +# before trying to apply the patch. Make sure these are unwound +# properly. Put each one in a diff along with something that will +# obviously conflict. Make sure it is back to normal after. +# + +test_expect_success 'cleanup edit p4 populate' ' + ( + cd "$cli" && + echo text file >text && + p4 add text && + echo text+x file >text+x && + chmod 755 text+x && + p4 add text+x && + p4 submit -d "populate p4" + ) +' + +setup_conflict() { + # clone before modifying file1 to force it to conflict + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + # ticks outside subshells + test_tick && + ( + cd "$cli" && + p4 open file1 && + echo $test_tick >>file1 && + p4 submit -d "$test_tick in file1" + ) && + test_tick && + ( + cd "$git" && + git config git-p4.skipSubmitEdit true && + # easy conflict + echo $test_tick >>file1 && + git add file1 + # caller will add more and submit + ) +} + +test_expect_success 'cleanup edit after submit fail' ' + setup_conflict && + ( + cd "$git" && + echo another line >>text && + git add text && + git commit -m "conflict" && + test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + # make sure it is not open + ! p4 fstat -T action text + ) +' + +test_expect_success 'cleanup add after submit fail' ' + setup_conflict && + ( + cd "$git" && + echo new file >textnew && + git add textnew && + git commit -m "conflict" && + test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + # make sure it is not there + # and that p4 thinks it is not added + # P4 returns 0 both for "not there but added" and + # "not there", so grep. + test_path_is_missing textnew && + p4 fstat -T action textnew 2>&1 | grep "no such file" + ) +' + +test_expect_success 'cleanup delete after submit fail' ' + setup_conflict && + ( + cd "$git" && + git rm text+x && + git commit -m "conflict" && + test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + # make sure it is there + test_path_is_file text+x && + ! p4 fstat -T action text+x + ) +' + +test_expect_success 'cleanup copy after submit fail' ' + setup_conflict && + ( + cd "$git" && + cp text text2 && + git add text2 && + git commit -m "conflict" && + git config git-p4.detectCopies true && + git config git-p4.detectCopiesHarder true && + # make sure setup is okay + git diff-tree -r -C --find-copies-harder HEAD | grep text2 | grep C100 && + test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_missing text2 && + p4 fstat -T action text2 2>&1 | grep "no such file" + ) +' + +test_expect_success 'cleanup rename after submit fail' ' + setup_conflict && + ( + cd "$git" && + git mv text text2 && + git commit -m "conflict" && + git config git-p4.detectRenames true && + # make sure setup is okay + git diff-tree -r -M HEAD | grep text2 | grep R100 && + test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_missing text2 && + p4 fstat -T action text2 2>&1 | grep "no such file" + ) +' + +# +# Cleanup after deciding not to submit during editTemplate. This +# involves unwinding more work, because files have been added, deleted +# and chmod-ed now. Same approach as above. +# + +test_expect_success 'cleanup edit after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + echo line >>text && + git add text && + git commit -m text && + echo n | test_expect_code 1 git p4 submit && + git reset --hard HEAD^ + ) && + ( + cd "$cli" && + ! p4 fstat -T action text && + test_cmp "$git"/text text + ) +' + +test_expect_success 'cleanup add after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + echo line >textnew && + git add textnew && + git commit -m textnew && + echo n | test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_missing textnew && + p4 fstat -T action textnew 2>&1 | grep "no such file" + ) +' + +test_expect_success 'cleanup delete after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + git rm text && + git commit -m "rm text" && + echo n | test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_file text && + ! p4 fstat -T action text + ) +' + +test_expect_success 'cleanup copy after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + cp text text2 && + git add text2 && + git commit -m text2 && + git config git-p4.detectCopies true && + git config git-p4.detectCopiesHarder true && + git diff-tree -r -C --find-copies-harder HEAD | grep text2 | grep C100 && + echo n | test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_missing text2 && + p4 fstat -T action text2 2>&1 | grep "no such file" + ) +' + +test_expect_success 'cleanup rename after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + git mv text text2 && + git commit -m text2 && + git config git-p4.detectRenames true && + git diff-tree -r -M HEAD | grep text2 | grep R100 && + echo n | test_expect_code 1 git p4 submit + ) && + ( + cd "$cli" && + test_path_is_missing text2 && + p4 fstat -T action text2 2>&1 | grep "no such file" + test_path_is_file text && + ! p4 fstat -T action text + ) +' + +test_expect_success 'cleanup chmod after submit cancel' ' + test_when_finished cleanup_git && + git p4 clone --dest="$git" //depot && + ( + cd "$git" && + chmod u+x text && + chmod u-x text+x && + git add text text+x && + git commit -m "chmod texts" && + echo n | test_expect_code 1 git p4 submit + ) && + ( + 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 + ) +' + +test_expect_success 'kill p4d' ' + kill_p4d +' + +test_done diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index 9bc57d27e9..8889ba5104 100644 --- a/t/test-lib-functions.sh +++ b/t/test-lib-functions.sh @@ -144,11 +144,22 @@ test_pause () { test_commit () { notick= && - if test "z$1" = "z--notick" - then - notick=yes + signoff= && + while test $# != 0 + do + case "$1" in + --notick) + notick=yes + ;; + --signoff) + signoff="$1" + ;; + *) + break + ;; + esac shift - fi && + done && file=${2:-"$1.t"} && echo "${3-$1}" > "$file" && git add "$file" && @@ -156,7 +167,7 @@ test_commit () { then test_tick fi && - git commit -m "$1" && + git commit $signoff -m "$1" && git tag "$1" } diff --git a/t/test-lib.sh b/t/test-lib.sh index 78c428619e..f8e3733ea0 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -100,12 +100,12 @@ unset CDPATH unset GREP_OPTIONS case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in - 1|2|true) - echo "* warning: Some tests will not work if GIT_TRACE" \ - "is set as to trace on STDERR ! *" - echo "* warning: Please set GIT_TRACE to something" \ - "other than 1, 2 or true ! *" - ;; +1|2|true) + echo "* warning: Some tests will not work if GIT_TRACE" \ + "is set as to trace on STDERR ! *" + echo "* warning: Please set GIT_TRACE to something" \ + "other than 1, 2 or true ! *" + ;; esac # Convenience @@ -172,17 +172,23 @@ do esac done -if test -n "$color"; then +if test -n "$color" +then say_color () { ( TERM=$ORIGINAL_TERM export TERM case "$1" in - error) tput bold; tput setaf 1;; # bold red - skip) tput bold; tput setaf 2;; # bold green - pass) tput setaf 2;; # green - info) tput setaf 3;; # brown - *) test -n "$quiet" && return;; + error) + tput bold; tput setaf 1;; # bold red + skip) + tput bold; tput setaf 2;; # bold green + pass) + tput setaf 2;; # green + info) + tput setaf 3;; # brown + *) + test -n "$quiet" && return;; esac shift printf "%s" "$*" @@ -298,7 +304,8 @@ test_run_ () { then test_eval_ "$test_cleanup" fi - if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE"; then + if test "$verbose" = "t" && test -n "$HARNESS_ACTIVE" + then echo "" fi return "$eval_ret" @@ -346,7 +353,8 @@ test_at_end_hook_ () { test_done () { GIT_EXIT_OK=t - if test -z "$HARNESS_ACTIVE"; then + if test -z "$HARNESS_ACTIVE" + then test_results_dir="$TEST_OUTPUT_DIRECTORY/test-results" mkdir -p "$test_results_dir" test_results_path="$test_results_dir/${0%.sh}-$$.counts" @@ -375,10 +383,18 @@ test_done () { case "$test_failure" in 0) # Maybe print SKIP message + if test -n "$skip_all" && test $test_count -gt 0 + then + error "Can't use skip_all after running some tests" + fi [ -z "$skip_all" ] || skip_all=" # SKIP $skip_all" - if test $test_external_has_tap -eq 0; then - say_color pass "# passed all $msg" + if test $test_external_has_tap -eq 0 + then + if test $test_count -gt 0 + then + say_color pass "# passed all $msg" + fi say "1..$test_count$skip_all" fi @@ -391,7 +407,8 @@ test_done () { exit 0 ;; *) - if test $test_external_has_tap -eq 0; then + if test $test_external_has_tap -eq 0 + then say_color error "# failed $test_failure among $msg" say "1..$test_count" fi @@ -471,22 +488,26 @@ then PATH=$GIT_VALGRIND/bin:$PATH GIT_EXEC_PATH=$GIT_VALGRIND/bin export GIT_VALGRIND -elif test -n "$GIT_TEST_INSTALLED" ; then +elif test -n "$GIT_TEST_INSTALLED" +then GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || error "Cannot run git from $GIT_TEST_INSTALLED." PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} else # normal case, use ../bin-wrappers only unless $with_dashes: git_bin_dir="$GIT_BUILD_DIR/bin-wrappers" - if ! test -x "$git_bin_dir/git" ; then - if test -z "$with_dashes" ; then + if ! test -x "$git_bin_dir/git" + then + if test -z "$with_dashes" + then say "$git_bin_dir/git is not executable; using GIT_EXEC_PATH" fi with_dashes=t fi PATH="$git_bin_dir:$PATH" GIT_EXEC_PATH=$GIT_BUILD_DIR - if test -n "$with_dashes" ; then + if test -n "$with_dashes" + then PATH="$GIT_BUILD_DIR:$PATH" fi fi @@ -521,7 +542,8 @@ then } fi -if ! test -x "$GIT_BUILD_DIR"/test-chmtime; then +if ! test -x "$GIT_BUILD_DIR"/test-chmtime +then echo >&2 'You need to build test-chmtime:' echo >&2 'Run "make test-chmtime" in the source (toplevel) directory' exit 1 @@ -544,7 +566,8 @@ rm -fr "$test" || { HOME="$TRASH_DIRECTORY" export HOME -if test -z "$TEST_NO_CREATE_REPO"; then +if test -z "$TEST_NO_CREATE_REPO" +then test_create_repo "$test" else mkdir -p "$test" diff --git a/test-regex.c b/test-regex.c new file mode 100644 index 0000000000..b5bfd54139 --- /dev/null +++ b/test-regex.c @@ -0,0 +1,20 @@ +#include <git-compat-util.h> + +int main(int argc, char **argv) +{ + char *pat = "[^={} \t]+"; + char *str = "={}\nfred"; + regex_t r; + regmatch_t m[1]; + + if (regcomp(&r, pat, REG_EXTENDED | REG_NEWLINE)) + die("failed regcomp() for pattern '%s'", pat); + if (regexec(&r, str, 1, m, 0)) + die("no match of pattern '%s' to string '%s'", pat, str); + + /* http://sourceware.org/bugzilla/show_bug.cgi?id=3957 */ + if (m[0].rm_so == 3) /* matches '\n' when it should not */ + die("regex bug confirmed: re-build git with NO_REGEX=1"); + + exit(0); +} @@ -62,7 +62,7 @@ static int get_trace_fd(const char *key, int *need_close) static const char err_msg[] = "Could not trace into fd given by " "GIT_TRACE environment variable"; -void trace_vprintf(const char *key, const char *fmt, va_list ap) +static void trace_vprintf(const char *key, const char *fmt, va_list ap) { struct strbuf buf = STRBUF_INIT; diff --git a/transport.h b/transport.h index b866c126e6..3b21c4abe6 100644 --- a/transport.h +++ b/transport.h @@ -106,6 +106,7 @@ struct transport { #define TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND 256 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) +#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x) /* Returns a transport suitable for the url */ struct transport *transport_get(struct remote *, const char *); diff --git a/wt-status.c b/wt-status.c index c110cbc125..2a9658bad4 100644 --- a/wt-status.c +++ b/wt-status.c @@ -100,8 +100,8 @@ void status_printf(struct wt_status *s, const char *color, va_end(ap); } -void status_printf_more(struct wt_status *s, const char *color, - const char *fmt, ...) +static void status_printf_more(struct wt_status *s, const char *color, + const char *fmt, ...) { va_list ap; @@ -221,7 +221,7 @@ static void wt_status_print_other_header(struct wt_status *s, const char *how) { const char *c = color(WT_STATUS_HEADER, s); - status_printf_ln(s, c, _("%s files:"), what); + status_printf_ln(s, c, "%s:", what); if (!advice_status_hints) return; status_printf_ln(s, c, _(" (use \"git %s <file>...\" to include in what will be committed)"), how); @@ -1008,9 +1008,9 @@ void wt_status_print(struct wt_status *s) wt_status_print_submodule_summary(s, 1); /* unstaged */ } if (s->show_untracked_files) { - wt_status_print_other(s, &s->untracked, _("Untracked"), "add"); + wt_status_print_other(s, &s->untracked, _("Untracked files"), "add"); if (s->show_ignored_files) - wt_status_print_other(s, &s->ignored, _("Ignored"), "add -f"); + wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f"); } else if (s->commitable) status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"), advice_status_hints @@ -1023,23 +1023,31 @@ void wt_status_print(struct wt_status *s) status_printf_ln(s, GIT_COLOR_NORMAL, _("No changes")); else if (s->nowarn) ; /* nothing */ - else if (s->workdir_dirty) - printf(_("no changes added to commit%s\n"), - advice_status_hints - ? _(" (use \"git add\" and/or \"git commit -a\")") : ""); - else if (s->untracked.nr) - printf(_("nothing added to commit but untracked files present%s\n"), - advice_status_hints - ? _(" (use \"git add\" to track)") : ""); - else if (s->is_initial) - printf(_("nothing to commit%s\n"), advice_status_hints - ? _(" (create/copy files and use \"git add\" to track)") : ""); - else if (!s->show_untracked_files) - printf(_("nothing to commit%s\n"), advice_status_hints - ? _(" (use -u to show untracked files)") : ""); - else - printf(_("nothing to commit%s\n"), advice_status_hints - ? _(" (working directory clean)") : ""); + else if (s->workdir_dirty) { + if (advice_status_hints) + printf(_("no changes added to commit " + "(use \"git add\" and/or \"git commit -a\")\n")); + else + printf(_("no changes added to commit\n")); + } else if (s->untracked.nr) { + if (advice_status_hints) + printf(_("nothing added to commit but untracked files " + "present (use \"git add\" to track)\n")); + else + printf(_("nothing added to commit but untracked files present\n")); + } else if (s->is_initial) { + if (advice_status_hints) + printf(_("nothing to commit (create/copy files " + "and use \"git add\" to track)\n")); + else + printf(_("nothing to commit\n")); + } else if (!s->show_untracked_files) { + if (advice_status_hints) + printf(_("nothing to commit (use -u to show untracked files)\n")); + else + printf(_("nothing to commit\n")); + } else + printf(_("nothing to commit, working directory clean\n")); } } diff --git a/wt-status.h b/wt-status.h index f8fc58cc0a..236b41fd34 100644 --- a/wt-status.h +++ b/wt-status.h @@ -92,7 +92,5 @@ void status_printf_ln(struct wt_status *s, const char *color, const char *fmt, . ; void status_printf(struct wt_status *s, const char *color, const char *fmt, ...) ; -void status_printf_more(struct wt_status *s, const char *color, const char *fmt, ...) - __attribute__((format(printf, 3, 4))); #endif /* STATUS_H */ |