summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* pathspec: give better message for submodule related pathspec errorsb/pathspec-errorsStefan Beller2017-01-092-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every once in a while someone complains to the mailing list to have run into this weird assertion[1]. The usual response from the mailing list is link to old discussions[2], and acknowledging the problem stating it is known. This patch accomplishes two things: 1. Switch assert() to die("BUG") to give a more readable message. 2. Take one of the cases where we hit a BUG and turn it into a normal "there was something wrong with the input" message. This assertion triggered for cases where there wasn't a programming bug, but just bogus input. In particular, if the user asks for a pathspec that is inside a submodule, we shouldn't assert() or die("BUG"); we should tell the user their request is bogus. The only reason we did not check for it, is the expensive nature of such a check, so callers avoid setting the flag PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE. However when we die due to bogus input, the expense of CPU cycles spent outweighs the user wondering what went wrong, so run that check unconditionally before dying with a more generic error message. Note: There is a case (e.g. "git -C submodule add .") in which we call strip_submodule_slash_expensive, as git-add requests it via the flag PATHSPEC_STRIP_SUBMODULE_SLASH_EXPENSIVE, but the assert used to trigger nevertheless, because the flag PATHSPEC_LITERAL was not set, such that we executed if (item->nowildcard_len < prefixlen) item->nowildcard_len = prefixlen; and prefixlen was not adapted (e.g. it was computed from "submodule/") So in the die_inside_submodule_path function we also need handle paths, that were stripped before, i.e. are the exact submodule path. This is why the conditions in die_inside_submodule_path are slightly different than in strip_submodule_slash_expensive. [1] https://www.google.com/search?q=item-%3Enowildcard_len [2] http://git.661346.n2.nabble.com/assert-failed-in-submodule-edge-case-td7628687.html https://www.spinics.net/lists/git/msg249473.html Helped-by: Jeff King <peff@peff.net> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: rename prefix_pathspec to init_pathspec_itembw/pathspec-cleanupBrandon Williams2017-01-081-17/+7
| | | | | | | | | Give a more relevant name to the prefix_pathspec function as it does more than just prefix a pathspec element. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: small readability changesBrandon Williams2017-01-081-10/+15
| | | | | | | | | | A few small changes to improve readability. This is done by grouping related assignments, adding blank lines, ensuring lines are <80 characters, and adding additional comments. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: create strip submodule slash helpersBrandon Williams2017-01-081-26/+42
| | | | | | | | | Factor out the logic responsible for stripping the trailing slash on pathspecs referencing submodules into its own function. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: create parse_element_magic helperBrandon Williams2017-01-081-17/+20
| | | | | | | | | | | | | Factor out the logic responsible for the magic in a pathspec element into its own function. Also avoid calling into the parsing functions when `PATHSPEC_LITERAL_PATH` is specified since it causes magic to be ignored and all paths to be treated as literals. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: create parse_long_magic functionBrandon Williams2017-01-081-35/+57
| | | | | | | | | | | Factor out the logic responsible for parsing long magic into its own function. As well as hoist the prefix check logic outside of the inner loop as there isn't anything that needs to be done after matching "prefix:". Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: create parse_short_magic functionBrandon Williams2017-01-081-18/+36
| | | | | | | | | Factor out the logic responsible for parsing short magic into its own function. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: factor global magic into its own functionBrandon Williams2017-01-081-49/+78
| | | | | | | | | | Create helper functions to read the global magic environment variables in additon to factoring out the global magic gathering logic into its own function. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: simpler logic to prefix original pathspec elementsBrandon Williams2017-01-081-20/+13
| | | | | | | | | | | | | | | | The logic used to prefix an original pathspec element with 'prefix' magic is more general purpose and can be used for more than just short magic. Remove the extra code paths and rename 'prefix_short_magic' to 'prefix_magic' to better indicate that it can be used in more general situations. Also, slightly change the logic which decides when to prefix the original element in order to prevent a pathspec of "." from getting converted to "" (empty string). Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: always show mnemonic and name in unsupported_magicBrandon Williams2017-01-081-15/+9
| | | | | | | | | | | | | | | For better clarity, always show the mnemonic and name of the unsupported magic being used. This lets users have a more clear understanding of what magic feature isn't supported. And if they supplied a mnemonic, the user will be told what its corresponding name is which will allow them to more easily search the man pages for that magic type. This also avoids passing an extra parameter around the pathspec initialization code. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: remove unused variable from unsupported_magicBrandon Williams2017-01-081-3/+2
| | | | | | | | Removed unused variable 'n' from the 'unsupported_magic()' function. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: copy and free owned memoryBrandon Williams2017-01-082-6/+21
| | | | | | | | | | | | | | | | | | The 'original' string entry in a pathspec_item is only duplicated some of the time, instead always make a copy of the original and take ownership of the memory. Since both 'match' and 'original' string entries in a pathspec_item are owned by the pathspec struct, they need to be freed when clearing the pathspec struct (in 'clear_pathspec()') and duplicated when copying the pathspec struct (in 'copy_pathspec()'). Also change the type of 'match' and 'original' to 'char *' in order to more explicitly show the ownership of the memory. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* pathspec: remove the deprecated get_pathspec functionBrandon Williams2017-01-084-43/+3
| | | | | | | | | | | | | | | | | Now that all callers of the old 'get_pathspec' interface have been migrated to use the new pathspec struct interface it can be removed from the codebase. Since there are no more users of the '_raw' field in the pathspec struct it can also be removed. This patch also removes the old functionality of modifying the const char **argv array that was passed into parse_pathspec. Instead the constructed 'match' string (which is a pathspec element with the prefix prepended) is only stored in its corresponding pathspec_item entry. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* ls-tree: convert show_recursive to use the pathspec struct interfaceBrandon Williams2017-01-081-9/+7
| | | | | | | | | Convert 'show_recursive()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* dir: convert fill_directory to use the pathspec struct interfaceBrandon Williams2017-01-081-4/+8
| | | | | | | | | Convert 'fill_directory()' to use the pathspec struct interface from using the '_raw' entry in the pathspec struct. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* dir: remove struct path_simplifyBrandon Williams2017-01-081-103/+76
| | | | | | | | | | | | Teach simplify_away() and exclude_matches_pathspec() to handle struct pathspec directly, eliminating the need for the struct path_simplify. Also renamed the len parameter to pathlen in exclude_matches_pathspec() to match the parameter names used in simplify_away(). Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* mv: remove use of deprecated 'get_pathspec()'Brandon Williams2017-01-081-19/+31
| | | | | | | | | | | | | | | | | Convert the 'internal_copy_pathspec()' function to 'prefix_path()' instead of using the deprecated 'get_pathspec()' interface. Also, rename 'internal_copy_pathspec()' to 'internal_prefix_pathspec()' to be more descriptive of what the funciton is actually doing. In addition to this, fix a memory leak caused by only duplicating some of the pathspec elements. Instead always duplicate all of the the pathspec elements as an intermediate step (with modificationed based on the passed in flags). This way the intermediate strings can then be freed after getting the result from 'prefix_path()'. Signed-off-by: Brandon Williams <bmwill@google.com> Reviewed-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 2.11v2.11.0Junio C Hamano2016-11-292-1/+6
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'jk/common-main'Junio C Hamano2016-11-294-9/+10
|\ | | | | | | | | | | | | Fix for a small regression in a topic already in 'master'. * jk/common-main: common-main: stop munging argv[0] path
| * common-main: stop munging argv[0] pathjk/common-mainJeff King2016-11-294-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 650c44925 (common-main: call git_extract_argv0_path(), 2016-07-01), the argv[0] that is seen in cmd_main() of individual programs is always the basename of the executable, as common-main strips off the full path. This can produce confusing results for git-daemon, which wants to re-exec itself. For instance, if the program was originally run as "/usr/lib/git/git-daemon", it will try just re-execing "git-daemon", which will find the first instance in $PATH. If git's exec-path has not been prepended to $PATH, we may find the git-daemon from a different version (or no git-daemon at all). Normally this isn't a problem. Git commands are run as "git daemon", the git wrapper puts the exec-path at the front of $PATH, and argv[0] is already "daemon" anyway. But running git-daemon via its full exec-path, while not really a recommended method, did work prior to 650c44925. Let's make it work again. The real goal of 650c44925 was not to munge argv[0], but to reliably set the argv0_path global. The only reason it munges at all is that one caller, the git.c wrapper, piggy-backed on that computation to find the command basename. Instead, let's leave argv[0] untouched in common-main, and have git.c do its own basename computation. While we're at it, let's drop the return value from git_extract_argv0_path(). It was only ever used in this one callsite, and its dual purposes is what led to this confusion in the first place. Note that by changing the interface, the compiler can confirm for us that there are no other callers storing the return value. But the compiler can't tell us whether any of the cmd_main() functions (besides git.c) were relying on the basename munging. However, we can observe that prior to 650c44925, no other cmd_main() functions did that munging, and no new cmd_main() functions have been introduced since then. So we can't be regressing any of those cases. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-292-4189/+5888
|\ \ | | | | | | | | | | | | | | | | | | | | | l10n-2.11.0-rnd3.1: update ru and ca translations * tag 'l10n-2.11.0-rnd3.1' of git://github.com/git-l10n/git-po: l10n: ru.po: update Russian translation l10n: ca.po: update translation
| * \ Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin2016-11-291-2066/+2868
| |\ \ | | | | | | | | | | | | | | | | * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation
| | * | l10n: ru.po: update Russian translationDimitriy Ryazantcev2016-11-291-2066/+2868
| | | | | | | | | | | | | | | | Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com>
| * | | l10n: ca.po: update translationAlex Henrie2016-11-281-2123/+3020
| |/ / | | | | | | | | | Signed-off-by: Alex Henrie <alexhenrie24@gmail.com>
* | | RelNotes: spelling and phrasing fixupsMarc Branchaud2016-11-281-76/+72
| | | | | | | | | | | | | | | Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-288-2193/+3167
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | l10n-2.11.0-rnd3 * tag 'l10n-2.11.0-rnd3' of git://github.com/git-l10n/git-po: l10n: de.po: translate 210 new messages l10n: fix unmatched single quote in error message
| * | l10n: de.po: translate 210 new messagesRalf Thielow2016-11-281-2111/+3085
| | | | | | | | | | | | | | | | | | | | | | | | Translate 210 new messages came from git.pot update in fda7b09 (l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed)) and c091ffb (l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
| * | l10n: fix unmatched single quote in error messageJiang Xin2016-11-257-82/+82
|/ / | | | | | | | | | | | | | | Translate one message introduced by commit: * 358718064b i18n: fix unmatched single quote in error message Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
* | Git 2.11-rc3v2.11.0-rc3Junio C Hamano2016-11-232-1/+10
| | | | | | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | Merge branch 'jc/setup-cleanup-fix'Junio C Hamano2016-11-238-20/+69
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | "git archive" and "git mailinfo" stopped reading from local configuration file with a recent update. * jc/setup-cleanup-fix: archive: read local configuration mailinfo: read local configuration
| * | archive: read local configurationjc/setup-cleanup-fixJunio C Hamano2016-11-226-15/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git archive" however didn't do the repository discovery and instead relied on the old behaviour. Teach the command to run a "gentle" version of repository discovery so that local configuration variables are honoured. [jc: stole tests from peff] Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | mailinfo: read local configurationJunio C Hamano2016-11-223-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12), we do not read from ".git/config" unless we know we are in a repository. "git mailinfo" however didn't do the repository discovery and instead relied on the old behaviour. This was mostly OK because it was merely run as a helper program by other porcelain scripts that first chdir's up to the root of the working tree. Teach the command to run a "gentle" version of repository discovery so that local configuration variables like mailinfo.scissors are honoured. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | Merge branch 'jt/trailer-with-cruft'Junio C Hamano2016-11-231-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * jt/trailer-with-cruft: doc: mention user-configured trailers
| * | | doc: mention user-configured trailersjt/trailer-with-cruftJonathan Tan2016-11-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 1462450 ("trailer: allow non-trailers in trailer block", 2016-10-21), functionality was added (and tested [1]) to allow non-trailer lines in trailer blocks, as long as those blocks contain at least one Git-generated or user-configured trailer, and consists of at least 25% trailers. The documentation was updated to mention this new functionality, but did not mention "user-configured trailer". Further update the documentation to also mention "user-configured trailer". [1] "with non-trailer lines mixed with a configured trailer" in t/t7513-interpret-trailers.sh Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | Merge branch 'js/rebase-i-commentchar-fix'Junio C Hamano2016-11-234-3/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "git rebase -i" did not work well with core.commentchar configuration variable for two reasons, both of which have been fixed. * js/rebase-i-commentchar-fix: rebase -i: handle core.commentChar=auto stripspace: respect repository config rebase -i: highlight problems with core.commentchar
| * | | | rebase -i: handle core.commentChar=autojs/rebase-i-commentchar-fixJohannes Schindelin2016-11-212-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When 84c9dc2 (commit: allow core.commentChar=auto for character auto selection, 2014-05-17) extended the core.commentChar functionality to allow for the value 'auto', it forgot that rebase -i was already taught to handle core.commentChar, and in turn forgot to let rebase -i handle that new value gracefully. Reported by Taufiq Hoven. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | stripspace: respect repository configJohannes Schindelin2016-11-212-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The way "git stripspace" reads the configuration was not quite kosher, in that the code forgot to probe for a possibly existing repository (note: stripspace is designed to be usable outside the repository as well). It read .git/config only when it was run from the top-level of the working tree by accident. A recent change b9605bc4f2 ("config: only read .git/config from configured repos", 2016-09-12) stopped reading the repository-local configuration file ".git/config" unless the repository discovery process is done, so that .git/config is never read even when run from the top-level, exposing the old bug more. When rebasing interactively with a commentChar defined in the current repository's config, the help text at the bottom of the edit script potentially used an incorrect comment character. This was not only funny-looking, but also resulted in tons of warnings like this one: Warning: the command isn't recognized in the following line - # Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
| * | | | rebase -i: highlight problems with core.commentcharJohannes Schindelin2016-11-212-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The interactive rebase does not currently play well with core.commentchar. Let's add some tests to highlight those problems that will be fixed in the remainder of the series. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge branch 'jc/for-each-ref-head-segfault-fix'Junio C Hamano2016-11-232-1/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a %(HEAD) placeholder in "for-each-ref --format=" option caused the command to segfault when on an unborn branch. * jc/for-each-ref-head-segfault-fix: for-each-ref: do not segv with %(HEAD) on an unborn branch
| * | | | | for-each-ref: do not segv with %(HEAD) on an unborn branchjc/for-each-ref-head-segfault-fixJunio C Hamano2016-11-182-1/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to flip between "*" and " " prefixes depending on what branch is checked out used in --format='%(HEAD)' did not consider that HEAD may resolve to an unborn branch and dereferenced a NULL. This will become a lot easier to trigger as the codepath will be used to reimplement "git branch [--list]" in the future. Signed-off-by: Junio C Hamano <gitster@pobox.com>
* | | | | Merge tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2016-11-228-16103/+23112
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | l10n-2.11.0-rnd2 * tag 'l10n-2.11.0-rnd2' of git://github.com/git-l10n/git-po: l10n: Fixed typo of git fetch-pack command l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed) l10n: zh_CN: for git v2.11.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 l10n: sv.po: Update Swedish translation (2913t0f0u) l10n: vi.po: Updated translation to v2.11.0 (2913t) l10n: ko.po: Update Korean translation l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) l10n: ru.po: update Russian translation
| * | | | | l10n: Fixed typo of git fetch-pack commandJiang Xin2016-11-226-183/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git 2.11.0-rc2 introduced one small l10n update, and this commit fixed the affected translations all in one batch. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | l10n: git.pot: v2.11.0 round 2 (1 new, 1 removed)Jiang Xin2016-11-221-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.11.0-rc2 for git v2.11.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2016-11-228-16066/+22976
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.11.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1 l10n: sv.po: Update Swedish translation (2913t0f0u) l10n: vi.po: Updated translation to v2.11.0 (2913t) l10n: ko.po: Update Korean translation l10n: git.pot: v2.11.0 round 1 (209 new, 53 removed) l10n: ru.po: update Russian translation
| | * | | | l10n: zh_CN: for git v2.11.0 l10n round 1Jiang Xin2016-11-211-2002/+2897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update 209 translations (2913t0f0u) for git v2.11.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | | | l10n: pt_PT: update Portuguese translationVasco Almeida2016-11-131-2027/+2947
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| | * | | | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin2016-11-091-2047/+2922
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git: l10n: fr.po fix grammar mistakes l10n: fr.po v2.11.0_rnd1
| | | * | | | l10n: fr.po fix grammar mistakesjfbu2016-11-061-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: jfbu <jfbu@free.fr>
| | | * | | | l10n: fr.po v2.11.0_rnd1Jean-Noel Avila2016-11-051-2037/+2916
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | * | | | | l10n: sv.po: Update Swedish translation (2913t0f0u)Peter Krefting2016-11-051-2019/+2936
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
View Lorry Controller Status