| b697d92 | Junio C Hamano | 07 June 2019, 16:39:21 UTC | Git 2.22 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2019, 16:39:21 UTC |
| 6ee1eac | Junio C Hamano | 07 June 2019, 16:36:32 UTC | Merge tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po l10n-2.22.0-rnd3 * tag 'l10n-2.22.0-rnd3' of git://github.com/git-l10n/git-po: (25 commits) l10n: fr.po: Review French translation l10n: de.po: Update German translation l10n: de.po: improve description of 'git reset --quiet' l10n: TEAMS: Change German translation team leader l10n: bg.po: Updated Bulgarian translation (4581t) l10n: zh_CN: Revision for git v2.22.0 l10n l10n: zh_CN: for git v2.22.0 l10n round 1~3 l10n: es: 2.22.0 round 3 l10n: it.po: Updated Italian translation l10n: fr v2.22.0 rnd 3 l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) l10n: es: 2.22.0 round 2 l10n: bg.po: Updated Bulgarian translation (4580t) l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 l10n: fr.po v2.22.0 round 2 l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) l10n: bg.po: Updated Bulgarian translation (4577t) l10n: es: 2.22.0 round 1 l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1 ... | 07 June 2019, 16:36:32 UTC |
| 0cdb8d2 | Jiang Xin | 07 June 2019, 08:51:09 UTC | Merge branch 'fr_review' of git://github.com/jnavila/git * 'fr_review' of git://github.com/jnavila/git: l10n: fr.po: Review French translation | 07 June 2019, 08:51:09 UTC |
| d014920 | Jiang Xin | 07 June 2019, 08:50:23 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4581t) | 07 June 2019, 08:50:23 UTC |
| 82eb147 | Cédric Malard | 05 June 2019, 21:33:52 UTC | l10n: fr.po: Review French translation Signed-off-by: Cédric Malard <c.malard-git@valdun.net> Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 07 June 2019, 06:54:28 UTC |
| 20fbf7d | Junio C Hamano | 06 June 2019, 21:03:36 UTC | Merge branch 'en/merge-directory-renames-fix' Recent code restructuring of merge-recursive engine introduced a regression dealing with rename/add conflict. * en/merge-directory-renames-fix: merge-recursive: restore accidentally dropped setting of path | 06 June 2019, 21:03:36 UTC |
| 219829a | Matthias Rüster | 01 June 2019, 12:32:49 UTC | l10n: de.po: Update German translation Reviewed-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> | 06 June 2019, 05:03:26 UTC |
| 8c18948 | Ralf Thielow | 28 February 2019, 18:25:51 UTC | l10n: de.po: improve description of 'git reset --quiet' Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 06 June 2019, 05:03:25 UTC |
| d314d77 | Matthias Rüster | 01 June 2019, 12:32:44 UTC | l10n: TEAMS: Change German translation team leader Acked-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Matthias Rüster <matthias.ruester@gmail.com> | 05 June 2019, 18:48:37 UTC |
| 481de8a | Elijah Newren | 04 June 2019, 20:27:50 UTC | merge-recursive: restore accidentally dropped setting of path In commit 8daec1df03de ("merge-recursive: switch from (oid,mode) pairs to a diff_filespec", 2019-04-05), we actually switched from (oid,mode,path) triplets to a diff_filespec -- but most callsites in the patch only needed to worry about oid and mode so the commit message focused on that. The oversight in the commit message apparently spilled over to the code as well; one of the dozen or so callsites accidentally dropped the setting of the path in the conversion. Restore the path setting in that location. Also, this pointed out that our testsuite was lacking a good rename/add test, at least one that involved the need for merge content with the rename. Add such a test, and since rename/add vs. add/rename could possibly be important, redo the merge the opposite direction to make sure we don't have issues with the direction of the merge. These testcases failed before restoring the setting of path, but with the paths appropriately set the testcases both pass. Reported-by: Ben Humphreys <behumphreys@atlassian.com> Based-on-patch-by: SZEDER Gábor <szeder.dev@gmail.com> Tested-by: Ben Humphreys <behumphreys@atlassian.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 June 2019, 16:30:40 UTC |
| de2b054 | Alexander Shopov | 05 June 2019, 06:51:15 UTC | l10n: bg.po: Updated Bulgarian translation (4581t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 05 June 2019, 06:51:15 UTC |
| 5b53363 | Fangyi Zhou | 02 June 2019, 21:41:45 UTC | l10n: zh_CN: Revision for git v2.22.0 l10n Revise 51 translations, improving consistency for some phrased. Update email address for Fangyi Zhou Signed-off-by: Fangyi Zhou <me@fangyi.io> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 June 2019, 00:37:30 UTC |
| d46c551 | Jiang Xin | 16 April 2019, 00:56:12 UTC | l10n: zh_CN: for git v2.22.0 l10n round 1~3 Translate 274 new messages (4581t0f0u) for git 2.22.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 June 2019, 00:37:30 UTC |
| 914bd09 | Jiang Xin | 05 June 2019, 00:35:35 UTC | Merge branch '2.22' of https://github.com/ChrisADR/git-po * '2.22' of https://github.com/ChrisADR/git-po: l10n: es: 2.22.0 round 3 | 05 June 2019, 00:35:35 UTC |
| 488ed58 | Jiang Xin | 05 June 2019, 00:17:28 UTC | Merge branch 'it-l10n-wip' of github.com:AlessandroMenti/git-po * 'it-l10n-wip' of github.com:AlessandroMenti/git-po: l10n: it.po: Updated Italian translation | 05 June 2019, 00:17:28 UTC |
| 922a0a7 | Christopher Diaz Riveros | 04 June 2019, 23:52:28 UTC | l10n: es: 2.22.0 round 3 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 04 June 2019, 23:52:28 UTC |
| bbc5570 | Alessandro Menti | 19 May 2019, 06:51:55 UTC | l10n: it.po: Updated Italian translation Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 04 June 2019, 20:27:19 UTC |
| 85b66ac | Jean-Noël Avila | 04 June 2019, 17:53:32 UTC | l10n: fr v2.22.0 rnd 3 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 04 June 2019, 17:53:32 UTC |
| 77e1962 | Tran Ngoc Quan | 04 June 2019, 01:10:46 UTC | l10n: vi.po(4581t): Updated Vietnamese translation for v2.22.0 round 3 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 04 June 2019, 01:13:53 UTC |
| 386544c | Jiang Xin | 04 June 2019, 00:27:36 UTC | l10n: git.pot: v2.22.0 round 3 (3 new, 2 removed) Generate po/git.pot from v2.22.0-rc3 for git v2.22.0 l10n round 3. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 04 June 2019, 00:27:36 UTC |
| b50e1c0 | Jiang Xin | 04 June 2019, 00:24:28 UTC | Merge branch 'master' of git://git.kernel.org/pub/scm/git/git * 'master' of git://git.kernel.org/pub/scm/git/git: Git 2.22-rc3 i18n: fix typos found during l10n for git 2.22.0 RelNotes: minor typo fixes in 2.22.0 draft list-objects-filter: disable 'sparse:path' filters | 04 June 2019, 00:24:28 UTC |
| 74583d8 | Junio C Hamano | 03 June 2019, 18:25:12 UTC | Git 2.22-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2019, 18:25:12 UTC |
| 4a787f7 | Junio C Hamano | 03 June 2019, 18:18:54 UTC | Merge branch 'cc/list-objects-filter-wo-sparse-path' Disable "--filter=sparse:path=<path>" that would allow reading from paths on the filesystem. * cc/list-objects-filter-wo-sparse-path: list-objects-filter: disable 'sparse:path' filters | 03 June 2019, 18:18:54 UTC |
| 8a1569d | Jiang Xin | 02 June 2019, 15:11:22 UTC | i18n: fix typos found during l10n for git 2.22.0 Fix two typos introduced by the following commits: + 31fba9d3b4 (diff-parseopt: convert --[src|dst]-prefix, 2019-03-24) + ed8b4132c8 (remote-curl: mark all error messages for translation, 2019-03-05) Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2019, 18:10:53 UTC |
| ee70b40 | Todd Zullinger | 01 June 2019, 15:51:06 UTC | RelNotes: minor typo fixes in 2.22.0 draft Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 June 2019, 18:06:18 UTC |
| 1c8ba5f | Christopher Diaz Riveros | 03 June 2019, 14:34:50 UTC | l10n: es: 2.22.0 round 2 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 03 June 2019, 14:34:50 UTC |
| cb56cf3 | Jiang Xin | 02 June 2019, 14:35:11 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 | 02 June 2019, 14:35:11 UTC |
| c181f4d | Jiang Xin | 02 June 2019, 14:09:35 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4580t) | 02 June 2019, 14:09:35 UTC |
| 9c21d45 | Alexander Shopov | 02 June 2019, 07:26:52 UTC | l10n: bg.po: Updated Bulgarian translation (4580t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 02 June 2019, 07:26:52 UTC |
| 35655fe | Tran Ngoc Quan | 01 June 2019, 01:36:37 UTC | l10n: vi.po(4580t): Updated Vietnamese translation for v2.22.0 round 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 01 June 2019, 01:37:57 UTC |
| fc8703c | Jean-Noël Avila | 31 May 2019, 08:46:21 UTC | l10n: fr.po v2.22.0 round 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 31 May 2019, 08:46:21 UTC |
| c08fd73 | Jiang Xin | 31 May 2019, 06:36:22 UTC | l10n: git.pot: v2.22.0 round 2 (6 new, 3 removed) Generate po/git.pot from v2.22.0-rc2 for git v2.22.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 31 May 2019, 06:36:22 UTC |
| a17177c | Jiang Xin | 31 May 2019, 06:34:26 UTC | Merge branch 'master' of git://git.kernel.org/pub/scm/git/git * 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits) Git 2.22-rc2 ... | 31 May 2019, 06:34:26 UTC |
| ea8a8d0 | Jiang Xin | 31 May 2019, 06:32:35 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po * 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation | 31 May 2019, 06:32:35 UTC |
| 874dd41 | Junio C Hamano | 30 May 2019, 17:56:29 UTC | Git 2.22-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 May 2019, 17:56:29 UTC |
| 8feb8e2 | Junio C Hamano | 30 May 2019, 17:50:47 UTC | Merge branch 'js/rebase-config-bitfix' * js/rebase-config-bitfix: rebase: replace incorrect logical negation by correct bitwise one | 30 May 2019, 17:50:47 UTC |
| c41b119 | Junio C Hamano | 30 May 2019, 17:50:46 UTC | Merge branch 'es/doc-gitsubmodules-markup' Doc markup fix. * es/doc-gitsubmodules-markup: gitsubmodules: align html and nroff lists | 30 May 2019, 17:50:46 UTC |
| 936dce6 | Junio C Hamano | 30 May 2019, 17:50:46 UTC | Merge branch 'ja/diff-opt-typofix' Typofix. * ja/diff-opt-typofix: diff: fix mistake in translatable strings | 30 May 2019, 17:50:46 UTC |
| 0e5387c | Junio C Hamano | 30 May 2019, 17:50:46 UTC | Merge branch 'jt/clone-server-option' A brown-paper-bag bugfix to a change already in 'master'. * jt/clone-server-option: fetch-pack: send server options after command | 30 May 2019, 17:50:46 UTC |
| fa03d9c | Junio C Hamano | 30 May 2019, 17:50:45 UTC | Merge branch 'sg/progress-off-by-one-fix' A brown-paper-bag bugfix to a change already in 'master'. * sg/progress-off-by-one-fix: progress: avoid empty line when breaking the progress line | 30 May 2019, 17:50:45 UTC |
| 2656ece | Junio C Hamano | 30 May 2019, 17:50:45 UTC | Merge branch 'js/rebase-deprecate-preserve-merges' A bit more leftover clean-up to deprepcate "rebase -p". * js/rebase-deprecate-preserve-merges: rebase docs: recommend `-r` over `-p` docs: say that `--rebase=preserve` is deprecated tests: mark a couple more test cases as requiring `rebase -p` | 30 May 2019, 17:50:45 UTC |
| 463dca6 | Junio C Hamano | 30 May 2019, 17:50:45 UTC | Merge branch 'sg/trace2-rename' Rename environment variables that are used to control the "trace2" mechanism to a more readable name. * sg/trace2-rename: trace2: document the supported values of GIT_TRACE2* env variables trace2: rename environment variables to GIT_TRACE2* | 30 May 2019, 17:50:45 UTC |
| 90f2d88 | Junio C Hamano | 30 May 2019, 17:50:44 UTC | Merge branch 'jh/trace2' * jh/trace2: trace2: fix tracing when NO_PTHREADS is defined | 30 May 2019, 17:50:45 UTC |
| 20aa7c5 | Junio C Hamano | 30 May 2019, 17:50:44 UTC | Merge branch 'nd/diff-parseopt' A brown-paper-bag bugfix to a change already in 'master'. * nd/diff-parseopt: parse-options: check empty value in OPT_INTEGER and OPT_ABBREV diff-parseopt: restore -U (no argument) behavior diff-parseopt: correct variable types that are used by parseopt | 30 May 2019, 17:50:44 UTC |
| e693237 | Christian Couder | 29 May 2019, 12:44:32 UTC | list-objects-filter: disable 'sparse:path' filters If someone wants to use as a filter a sparse file that is in the repository, something like "--filter=sparse:oid=<ref>:<path>" already works. So 'sparse:path' is only interesting if the sparse file is not in the repository. In this case though the current implementation has a big security issue, as it makes it possible to ask the server to read any file, like for example /etc/password, and to explore the filesystem, as well as individual lines of files. If someone is interested in using a sparse file that is not in the repository as a filter, then at the minimum a config option, such as "uploadpack.sparsePathFilter", should be implemented first to restrict the directory from which the files specified by 'sparse:path' can be read. For now though, let's just disable 'sparse:path' filters. Helped-by: Matthew DeVore <matvore@google.com> Helped-by: Jeff Hostetler <git@jeffhostetler.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2019, 18:05:34 UTC |
| f7e68a0 | Nguyễn Thái Ngọc Duy | 29 May 2019, 09:11:16 UTC | parse-options: check empty value in OPT_INTEGER and OPT_ABBREV When parsing the argument for OPT_INTEGER and OPT_ABBREV, we check if we can parse the entire argument to a number with "if (*s)". There is one missing check: if "arg" is empty to begin with, we fail to notice. This could happen with long option by writing like git diff --inter-hunk-context= blah blah Before 16ed6c97cc (diff-parseopt: convert --inter-hunk-context, 2019-03-24), --inter-hunk-context is handled by a custom parser opt_arg() and does detect this correctly. This restores the bahvior for --inter-hunk-context and make sure all other integer options are handled the same (sane) way. For OPT_ABBREV this is new behavior. But it makes it consistent with the rest. PS. OPT_MAGNITUDE has similar code but git_parse_ulong() does detect empty "arg". So it's good to go. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2019, 18:04:33 UTC |
| 8ef0519 | Nguyễn Thái Ngọc Duy | 29 May 2019, 09:11:15 UTC | diff-parseopt: restore -U (no argument) behavior Before d473e2e0e8 (diff.c: convert -U|--unified, 2019-01-27), -U and --unified are implemented with a custom parser opt_arg() in diff.c. I didn't check this code carefully and not realize that it's the equivalent of PARSE_OPT_NONEG | PARSE_OPT_OPTARG. In other words, if -U is specified without any argument, the option should be accepted, and the default value should be used. Without PARSE_OPT_OPTARG, parse_options() will reject this case and cause a regression. Reported-by: Bryan Turner <bturner@atlassian.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2019, 18:04:32 UTC |
| 7f125ff | Nguyễn Thái Ngọc Duy | 29 May 2019, 09:11:14 UTC | diff-parseopt: correct variable types that are used by parseopt Most number-related OPT_ macros store the value in an 'int' variable. Many of the variables in 'struct diff_options' have a different type, but during the conversion to using parse_options() I failed to notice and correct. The problem was reported on s360x which is a big-endian architechture. The variable to store '-w' option in this case is xdl_opts, 'long' type, 8 bytes. But since parse_options() assumes 'int' (4 bytes), it will store bits in the wrong part of xdl_opts. The problem was found on little-endian platforms because parse_options() will accidentally store at the right part of xdl_opts. There aren't much to say about the type change (except that 'int' for xdl_opts should still be big enough, since Windows' long is the same size as 'int' and nobody has complained so far). Some safety checks may be implemented in the future to prevent class of bugs. Reported-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2019, 18:04:30 UTC |
| 75a9e02 | Jiang Xin | 29 May 2019, 14:01:19 UTC | Merge branch 'master' of git://github.com/alshopov/git-po * 'master' of git://github.com/alshopov/git-po: l10n: bg.po: Updated Bulgarian translation (4577t) | 29 May 2019, 14:01:19 UTC |
| 47e80a2 | Alexander Shopov | 17 May 2019, 08:27:52 UTC | l10n: bg.po: Updated Bulgarian translation (4577t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 29 May 2019, 08:27:27 UTC |
| 7948b49 | Johannes Schindelin | 28 May 2019, 12:42:16 UTC | rebase docs: recommend `-r` over `-p` The `--preserve-merges` option is now deprecated in favor of `--rebase-merges`; Let's stop recommending the former. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 20:22:35 UTC |
| 7401ab9 | Johannes Schindelin | 28 May 2019, 12:42:15 UTC | docs: say that `--rebase=preserve` is deprecated As of Git v2.22.0, the `--preserve-merges` backend of `git rebase` will be officially deprecated in favor of the `--rebase-merges` backend. Consequently, `git pull --rebase=preserve` will also be deprected. State this explicitly. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 20:22:34 UTC |
| db4a3f2 | Johannes Schindelin | 28 May 2019, 12:42:14 UTC | tests: mark a couple more test cases as requiring `rebase -p` The `--preserve-merges` option has been deprecated, and as a consequence we started to mark test cases that require that option to be supported, in preparation for removing that support eventually. Since we marked those test cases, a couple more crept into the test suite, and with this patch, we mark them, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 20:22:32 UTC |
| 5b204b7 | Jonathan Tan | 22 May 2019, 20:08:22 UTC | fetch-pack: send server options after command Currently, if any server options are specified during a protocol v2 fetch, server options will be sent before "command=fetch". Write server options to the request buffer in send_fetch_request() so that the components of the request are sent in the correct order. The protocol documentation states that the command must come first. The Git server implementation in serve.c (see process_request() in that file) tolerates any order of command and capability, which is perhaps why we haven't noticed this. This was noticed when testing against a JGit server implementation, which follows the documentation in this regard. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 18:01:07 UTC |
| 5fdae9d | Jeff Hostetler | 21 May 2019, 19:33:59 UTC | trace2: fix tracing when NO_PTHREADS is defined Teach trace2 TLS code to not rely on pthread_getspecific() when NO_PTHREADS is defined. Instead, always assume the context data of the main thread. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 17:52:34 UTC |
| 4c785c0 | Johannes Schindelin | 21 May 2019, 17:50:20 UTC | rebase: replace incorrect logical negation by correct bitwise one In bff014dac7d9 (builtin rebase: support the `verbose` and `diffstat` options, 2018-09-04), we added a line that wanted to remove the `REBASE_DIFFSTAT` bit from the flags, but it used an incorrect negation. Found by Coverity. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 17:49:19 UTC |
| 1aed1a5 | SZEDER Gábor | 19 May 2019, 14:45:46 UTC | progress: avoid empty line when breaking the progress line Since commit 545dc345eb (progress: break too long progress bar lines, 2019-04-12) when splitting a too long progress line, sometimes it looks as if a superfluous empty line were added between the title line and the counters. To make sure that the previously displayed progress line is completely covered up when writing the new, shorter title line, we calculate how many characters need to be overwritten with spaces. Alas, this calculation doesn't account for the newline character at the end of the new title line, and resulted in printing one more space than strictly necessary. This extra space character doesn't matter, if the length of the previous progress line was shorter than the width of the terminal. However, if the previous line matched the terminal width, then this extra space made the new line longer, effectively adding that empty line after the title line. Fix this off-by-one to avoid that spurious empty line. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 17:21:11 UTC |
| 4e0d3aa | SZEDER Gábor | 19 May 2019, 14:43:09 UTC | trace2: document the supported values of GIT_TRACE2* env variables The descriptions of the GIT_TRACE2* environment variables link to the technical docs for further details on the supported values. However, a link like this only really works if the docs are viewed in a browser and the full documentation is available. OTOH, in 'man git' there are no links to conveniently click on, and distro-shipped git packages tend to include only the man pages, while the technical docs and the docs in html format are in a separate 'git-doc' package. So let's describe the supported values to make the manpage more self-contained, but still keep the references to the technical docs because the details of the SID, and the JSON and perf output formats are definitely beyond the scope of 'man git'. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 17:20:36 UTC |
| e4b75d6 | SZEDER Gábor | 19 May 2019, 14:43:08 UTC | trace2: rename environment variables to GIT_TRACE2* For an environment variable that is supposed to be set by users, the GIT_TR2* env vars are just too unclear, inconsistent, and ugly. Most of the established GIT_* environment variables don't use abbreviations, and in case of the few that do (GIT_DIR, GIT_COMMON_DIR, GIT_DIFF_OPTS) it's quite obvious what the abbreviations (DIR and OPTS) stand for. But what does TR stand for? Track, traditional, trailer, transaction, transfer, transformation, transition, translation, transplant, transport, traversal, tree, trigger, truncate, trust, or ...?! The trace2 facility, as the '2' suffix in its name suggests, is supposed to eventually supercede Git's original trace facility. It's reasonable to expect that the corresponding environment variables follow suit, and after the original GIT_TRACE variables they are called GIT_TRACE2; there is no such thing is 'GIT_TR'. All trace2-specific config variables are, very sensibly, in the 'trace2' section, not in 'tr2'. OTOH, we don't gain anything at all by omitting the last three characters of "trace" from the names of these environment variables. So let's rename all GIT_TR2* environment variables to GIT_TRACE2*, before they make their way into a stable release. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 17:20:34 UTC |
| 8e9fe16 | Emily Shaffer | 01 May 2019, 20:32:17 UTC | gitsubmodules: align html and nroff lists There appears to be a bug in the toolchain generating manpages from lettered lists. When a list is enumerated with letters, the resulting nroff shows numbers instead. Mostly this is harmless, but in the case of gitsubmodules, the paragraph following the list refers back to each bullet by letter. As a result, reading this documentation via `man gitsubmodules` is hard to parse - readers must infer that a bug exists and a refers to 1, b refers to 2, and c refers to 3 in the list above. The problem specifically was introduced in ad47194; previously rather than generating numerated lists the bulleted area was entirely monospaced in HTML and shown in plaintext in nroff. The bug seems to exist in docbook-xml - I've reported it on May 1 via the docbook-apps mail list - but for now it may make more sense to just work around the issue. Signed-off-by: Emily Shaffer <emilyshaffer@google.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2019, 16:42:06 UTC |
| d0b1b61 | Christopher Diaz Riveros | 28 May 2019, 16:33:00 UTC | l10n: es: 2.22.0 round 1 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 28 May 2019, 16:33:00 UTC |
| 1e24ee8 | Jiang Xin | 21 May 2019, 00:55:54 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1 | 21 May 2019, 00:55:54 UTC |
| aa25c82 | Junio C Hamano | 19 May 2019, 07:46:42 UTC | Git 2.22-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2019, 07:46:42 UTC |
| fab4a8a | Junio C Hamano | 19 May 2019, 07:45:35 UTC | Merge branch 'js/difftool-no-index' The "--dir-diff" mode of "git difftool" is not useful in "--no-index" mode; they are now explicitly marked as mutually incompatible. * js/difftool-no-index: difftool --no-index: error out on --dir-diff (and don't crash) | 19 May 2019, 07:45:35 UTC |
| 8c59ba9 | Junio C Hamano | 19 May 2019, 07:45:35 UTC | Merge branch 'jk/get-oid-indexed-object-name' The codepath to parse :<path> that obtains the object name for an indexed object has been made more robust. * jk/get-oid-indexed-object-name: get_oid: handle NULL repo->index | 19 May 2019, 07:45:35 UTC |
| bca6aba | Junio C Hamano | 19 May 2019, 07:45:35 UTC | Merge branch 'jc/set-packet-header-signature-fix' Code clean-up. * jc/set-packet-header-signature-fix: pkt-line: drop 'const'-ness of a param to set_packet_header() | 19 May 2019, 07:45:35 UTC |
| 8cbad49 | Junio C Hamano | 19 May 2019, 07:45:35 UTC | Merge branch 'cb/http-push-null-in-message-fix' Code clean-up. * cb/http-push-null-in-message-fix: http-push: prevent format overflow warning with gcc >= 9 | 19 May 2019, 07:45:35 UTC |
| 4ecaede | Junio C Hamano | 19 May 2019, 07:45:34 UTC | Merge branch 'js/stash-in-c-use-builtin-doc' Doc update. * js/stash-in-c-use-builtin-doc: stash: document stash.useBuiltin | 19 May 2019, 07:45:34 UTC |
| dc58922 | Junio C Hamano | 19 May 2019, 07:45:34 UTC | Merge branch 'tz/test-lib-check-working-jgit' A prerequiste check in the test suite to see if a working jgit is available was made more robust. * tz/test-lib-check-working-jgit: test-lib: try harder to ensure a working jgit | 19 May 2019, 07:45:34 UTC |
| 7a09f5f | Junio C Hamano | 19 May 2019, 07:45:34 UTC | Merge branch 'js/parseopt-unknown-cb-returns-an-enum' Code clean-up. * js/parseopt-unknown-cb-returns-an-enum: parse-options: adjust `parse_opt_unknown_cb()`s declared return type | 19 May 2019, 07:45:34 UTC |
| ed8a451 | Junio C Hamano | 19 May 2019, 07:45:34 UTC | Merge branch 'ab/sha1dc' Update collision-detecting SHA-1 code to build properly on HP-UX. * ab/sha1dc: sha1dc: update from upstream | 19 May 2019, 07:45:34 UTC |
| e0708c2 | Junio C Hamano | 19 May 2019, 07:45:33 UTC | Merge branch 'js/rebase-i-label-shown-in-status-fix' "git status" did not know that the "label" instruction in the todo-list "rebase -i -r" uses should not be shown as a hex object name. * js/rebase-i-label-shown-in-status-fix: status: fix display of rebase -ir's `label` command | 19 May 2019, 07:45:33 UTC |
| dd5b7dc | Junio C Hamano | 19 May 2019, 07:45:33 UTC | Merge branch 'es/check-non-portable-pre-5.10' Developer support update. * es/check-non-portable-pre-5.10: check-non-portable-shell: support Perl versions older than 5.10 | 19 May 2019, 07:45:33 UTC |
| bd96a78 | Junio C Hamano | 19 May 2019, 07:45:33 UTC | Merge branch 'ds/trace2-document-env-vars' Doc update. * ds/trace2-document-env-vars: trace2: add variable description to git.txt | 19 May 2019, 07:45:33 UTC |
| cfd635c | Junio C Hamano | 19 May 2019, 07:45:33 UTC | Merge branch 'js/fsmonitor-refresh-after-discarding-index' The fsmonitor interface got out of sync after the in-core index file gets discarded, which has been corrected. * js/fsmonitor-refresh-after-discarding-index: fsmonitor: force a refresh after the index was discarded fsmonitor: demonstrate that it is not refreshed after discard_index() | 19 May 2019, 07:45:33 UTC |
| 521d3ef | Junio C Hamano | 19 May 2019, 07:45:32 UTC | Merge branch 'cm/notes-comment-fix' A stale in-code comment has been updated. * cm/notes-comment-fix: notes: correct documentation of format_display_notes() | 19 May 2019, 07:45:32 UTC |
| b3e0981 | Junio C Hamano | 19 May 2019, 07:45:32 UTC | Merge branch 'tt/no-ipv6-fallback-for-winxp' Code cleanup. * tt/no-ipv6-fallback-for-winxp: mingw: remove obsolete IPv6-related code | 19 May 2019, 07:45:32 UTC |
| 0b076b4 | Junio C Hamano | 19 May 2019, 07:45:32 UTC | Merge branch 'js/t5580-unc-alternate-test' An additional test for MinGW * js/t5580-unc-alternate-test: t5580: verify that alternates can be UNC paths | 19 May 2019, 07:45:32 UTC |
| b5fb62b | Junio C Hamano | 19 May 2019, 07:45:31 UTC | Merge branch 'ds/cvsexportcommit-force-text' "git cvsexportcommit" running on msys did not expect cvsnt showed "cvs status" output with CRLF line endings. * ds/cvsexportcommit-force-text: cvsexportcommit: force crlf translation | 19 May 2019, 07:45:31 UTC |
| 6f3d93f | Junio C Hamano | 19 May 2019, 07:45:31 UTC | Merge branch 'sg/ci-libsvn-perl' To run tests for Git SVN, our scripts for CI used to install the git-svn package (in the hope that it would bring in the right dependencies). This has been updated to install the more direct dependency, namely, libsvn-perl. * sg/ci-libsvn-perl: ci: install 'libsvn-perl' instead of 'git-svn' | 19 May 2019, 07:45:31 UTC |
| 717dad8 | Junio C Hamano | 19 May 2019, 07:45:31 UTC | Merge branch 'bl/t4253-exit-code-from-format-patch' Avoid patterns to pipe output from a git command to feed another command in tests. * bl/t4253-exit-code-from-format-patch: t4253-am-keep-cr-dos: avoid using pipes | 19 May 2019, 07:45:31 UTC |
| 454b419 | Junio C Hamano | 19 May 2019, 07:45:30 UTC | Merge branch 'ds/midx-too-many-packs' The code to generate the multi-pack idx file was not prepared to see too many packfiles and ran out of open file descriptor, which has been corrected. * ds/midx-too-many-packs: midx: add packs to packed_git linked list midx: pass a repository pointer | 19 May 2019, 07:45:30 UTC |
| 97616ca | Junio C Hamano | 19 May 2019, 07:45:30 UTC | Merge branch 'en/unicode-in-refnames' On a filesystem like HFS+, the names of the refs stored as filesystem entities may become different from what the end-user expects, just like files in the working tree get "renamed". Work around the mismatch by paying attention to the core.precomposeUnicode configuration. * en/unicode-in-refnames: Honor core.precomposeUnicode in more places | 19 May 2019, 07:45:30 UTC |
| 85ac27e | Junio C Hamano | 19 May 2019, 07:45:30 UTC | Merge branch 'dl/difftool-mergetool' Update "git difftool" and "git mergetool" so that the combinations of {diff,merge}.{tool,guitool} configuration variables serve as fallback settings of each other in a sensible order. * dl/difftool-mergetool: difftool: fallback on merge.guitool difftool: make --gui, --tool and --extcmd mutually exclusive mergetool: fallback to tool when guitool unavailable mergetool--lib: create gui_mode function mergetool: use get_merge_tool function t7610: add mergetool --gui tests t7610: unsuppress output | 19 May 2019, 07:45:30 UTC |
| fed9391 | Junio C Hamano | 19 May 2019, 07:45:29 UTC | Merge branch 'mh/http-fread-api-fix' A pair of private functions in http.c that had names similar to fread/fwrite did not return the number of elements, which was found to be confusing. * mh/http-fread-api-fix: Make fread/fwrite-like functions in http.c more like fread/fwrite. | 19 May 2019, 07:45:29 UTC |
| b20b8fe | Junio C Hamano | 19 May 2019, 07:45:29 UTC | Merge branch 'js/t6500-use-windows-pid-on-mingw' Future-proof a test against an update to MSYS2 runtime v3.x series. * js/t6500-use-windows-pid-on-mingw: t6500(mingw): use the Windows PID of the shell | 19 May 2019, 07:45:29 UTC |
| 7782066 | Junio C Hamano | 19 May 2019, 07:45:29 UTC | Merge branch 'jk/apache-lsan' Allow tests that involve httpd to be run under leak sanitizer, just like we can already do so under address sanitizer. * jk/apache-lsan: t/lib-httpd: pass LSAN_OPTIONS through apache | 19 May 2019, 07:45:29 UTC |
| 2cfab60 | Junio C Hamano | 19 May 2019, 07:45:28 UTC | Merge branch 'nd/parse-options-aliases' Attempt to use an abbreviated option in "git clone --recurs" is responded by a request to disambiguate between --recursive and --recurse-submodules, which is bad because these two are synonyms. The parse-options API has been extended to define such synonyms more easily and not produce an unnecessary failure. * nd/parse-options-aliases: parse-options: don't emit "ambiguous option" for aliases | 19 May 2019, 07:45:28 UTC |
| 4ac8371 | Junio C Hamano | 19 May 2019, 07:45:28 UTC | Merge branch 'dl/branch-from-3dot-merge-base' "git branch new A...B" and "git checkout -b new A...B" have been taught that in their contexts, the notation A...B means "the merge base between these two commits", just like "git checkout A...B" detaches HEAD at that commit. * dl/branch-from-3dot-merge-base: branch: make create_branch accept a merge base rev t2018: cleanup in current test | 19 May 2019, 07:45:28 UTC |
| 3c9b393 | Junio C Hamano | 19 May 2019, 07:45:28 UTC | Merge branch 'js/commit-graph-parse-leakfix' Leakfix. * js/commit-graph-parse-leakfix: commit-graph: fix memory leak | 19 May 2019, 07:45:28 UTC |
| 6795fc8 | Junio C Hamano | 19 May 2019, 07:45:28 UTC | Merge branch 'jk/cocci-batch' Optionally "make coccicheck" can feed multiple source files to spatch, gaining performance while spending more memory. * jk/cocci-batch: coccicheck: make batch size of 0 mean "unlimited" coccicheck: optionally batch spatch invocations | 19 May 2019, 07:45:28 UTC |
| 82dca95 | Junio C Hamano | 19 May 2019, 07:45:28 UTC | Merge branch 'ab/perf-installed-fix' Performance test framework has been broken and measured the version of Git that happens to be on $PATH, not the specified one to measure, for a while, which has been corrected. * ab/perf-installed-fix: perf-lib.sh: forbid the use of GIT_TEST_INSTALLED perf tests: add "bindir" prefix to git tree test results perf-lib.sh: remove GIT_TEST_INSTALLED from perf-lib.sh perf-lib.sh: make "./run <revisions>" use the correct gits perf aggregate: remove GIT_TEST_INSTALLED from --codespeed perf README: correct docs for 3c8f12c96c regression | 19 May 2019, 07:45:28 UTC |
| f42bee7 | Junio C Hamano | 19 May 2019, 07:45:27 UTC | Merge branch 'id/windows-dep-aslr' Allow DEP and ASLR for Windows build to for security hardening. * id/windows-dep-aslr: mingw: enable DEP and ASLR mingw: do not let ld strip relocations | 19 May 2019, 07:45:27 UTC |
| d66da83 | Junio C Hamano | 19 May 2019, 07:45:27 UTC | Merge branch 'ab/trace2-typofix' Typofix. * ab/trace2-typofix: trace2: fix up a missing "leave" entry point | 19 May 2019, 07:45:27 UTC |
| 195d799 | Junio C Hamano | 19 May 2019, 07:45:27 UTC | Merge branch 'nd/submodule-helper-incomplete-line-fix' Typofix. * nd/submodule-helper-incomplete-line-fix: submodule--helper: add a missing \n | 19 May 2019, 07:45:27 UTC |
| 18cfb74 | Junio C Hamano | 19 May 2019, 07:45:26 UTC | Merge branch 'cw/diff-highlight' Portability fix for a diff-highlight tool (in contrib/). * cw/diff-highlight: diff-highlight: use correct /dev/null for UNIX and Windows | 19 May 2019, 07:45:26 UTC |
| 1294160 | Junio C Hamano | 19 May 2019, 07:45:26 UTC | Merge branch 'dl/warn-tagging-a-tag' Typofix. * dl/warn-tagging-a-tag: tag: fix typo in nested tagging hint | 19 May 2019, 07:45:26 UTC |
| 8bcd8f4 | Jean-Noël Avila | 17 May 2019, 19:26:19 UTC | diff: fix mistake in translatable strings Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2019, 02:01:02 UTC |
| 28e0eb8 | Tran Ngoc Quan | 19 May 2019, 01:40:33 UTC | l10n: vi.po(4577t): Updated Vietnamese translation for v2.22.0 round 1 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 19 May 2019, 01:40:33 UTC |
| 1d9f0b7 | Jean-Noël Avila | 17 May 2019, 17:55:39 UTC | l10n: fr.po v2.22.0.rnd1 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 17 May 2019, 17:55:39 UTC |
