| 8104ec9 | Junio C Hamano | 24 February 2019, 15:55:19 UTC | Git 2.21 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2019, 15:55:19 UTC |
| 572e460 | Junio C Hamano | 24 February 2019, 15:18:00 UTC | Merge branch 'yn/checkout-doc-fix' Doc fix. * yn/checkout-doc-fix: checkout doc: fix an unmatched double-quote pair | 24 February 2019, 15:18:00 UTC |
| a1997da | Junio C Hamano | 24 February 2019, 15:03:39 UTC | Merge tag 'l10n-2.21.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.21.0-rnd2 * tag 'l10n-2.21.0-rnd2' of git://github.com/git-l10n/git-po: l10n: bg.po: Updated Bulgarian translation (4363t) l10n: update German translation l10n: zh_CN: Revision for git v2.21.0 l10n l10n: zh_CN: for git v2.21.0 l10n round 1~2 l10n: bg.po: correct typo l10n: Update Swedish translation (4363t0f0u) l10n: de.po: fix grammar in message for tag.c l10n: de.po: fix a message for index-pack.c l10n: de.po: consistent translation of 'root commit' l10n: it: update the Italian translation l10n: es: 2.21.0 round 2 l10n: el: add Greek l10n team and essential translations l10n: fr.po v2.21.0 rnd 2 l10n: fr.po Fix some typos from round3 l10n: fr.po Fix some typos l10n: Fixes to Catalan translation l10n: git.pot: v2.21.0 round 2 (3 new, 3 removed) l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed) l10n: zh_CN: fix typo of submodule init message l10n: Update Catalan translation | 24 February 2019, 15:03:39 UTC |
| 39ffebd | Johannes Schindelin | 23 February 2019, 14:49:23 UTC | README: adjust for final Azure Pipeline ID During the six months of development of the Azure Pipelines support, the patches went through quite a few iterations of changes, and to test those iterations, a temporary build definition was used. In the meantime, Azure Pipelines support made it to `master`, and we now have a regular Azure Pipeline, installed via the common GitHub App workflow. This new pipeline has a different name (git.git instead of test-git.git), and a new ID (11 instead of 2). Let's adjust the badge in our README to reflect that final shape of the Azure Pipeline. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2019, 05:27:04 UTC |
| c5c0a5f | Yoichi Nakayama | 23 February 2019, 06:33:40 UTC | checkout doc: fix an unmatched double-quote pair Signed-off-by: Yoichi Nakayama <yoichi.nakayama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2019, 05:24:25 UTC |
| ab8f4f5 | Alexander Shopov | 23 February 2019, 16:39:07 UTC | l10n: bg.po: Updated Bulgarian translation (4363t) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 23 February 2019, 21:29:23 UTC |
| c65a288 | Junio C Hamano | 23 February 2019, 05:20:19 UTC | Merge branch 'ab/bsd-fixes' Test portability fix. * ab/bsd-fixes: commit-graph tests: fix unportable "dd" invocation tests: fix unportable "\?" and "\+" regex syntax | 23 February 2019, 05:20:19 UTC |
| 60a3fbf | Junio C Hamano | 23 February 2019, 05:20:19 UTC | Merge branch 'ab/workaround-dash-bug-in-test' * ab/workaround-dash-bug-in-test: tests: avoid syntax triggering old dash bug | 23 February 2019, 05:20:19 UTC |
| b9cc405 | Ævar Arnfjörð Bjarmason | 21 February 2019, 19:28:49 UTC | commit-graph tests: fix unportable "dd" invocation Change an unportable invocation of "dd" with count=0, that wanted to truncate the commit-graph file. In POSIX it is unspecified what happens when count=0 is provided[1]. The NetBSD "dd" behavior differs from GNU (and seemingly other BSDs), which has left this test broken since d2b86fbaa1 ("commit-graph: fix buffer read-overflow", 2019-01-15). Copying from /dev/null would seek/truncate to seek=$zero_pos and stop immediately after that (without being able to copy anything), which is the right way to truncate the file. 1. http://pubs.opengroup.org/onlinepubs/9699919799/utilities/dd.html Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Helped-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2019, 19:20:56 UTC |
| e7bc80b | Jiang Xin | 22 February 2019, 14:18:12 UTC | Merge branch 'master' of https://github.com/ralfth/git-po-de | 22 February 2019, 14:18:12 UTC |
| e5a5d5c | Ralf Thielow | 22 February 2019, 07:45:40 UTC | l10n: update German translation Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com> | 22 February 2019, 07:47:26 UTC |
| 4abf20f | Ævar Arnfjörð Bjarmason | 21 February 2019, 19:28:48 UTC | tests: fix unportable "\?" and "\+" regex syntax Fix widely supported but non-POSIX basic regex syntax introduced in [1] and [2]. On GNU, NetBSD and FreeBSD the following works: $ echo xy >f $ grep 'xy\?' f; echo $? xy 0 The same goes for "\+". The "?" and "+" syntax is not in the BRE syntax, just in ERE, but on some implementations it can be invoked by prefixing the meta-operator with "\", but not on OpenBSD: $ uname -a OpenBSD obsd.my.domain 6.2 GENERIC#132 amd64 $ grep --version grep version 0.9 $ grep 'xy\?' f; echo $? 1 Let's fix this by moving to ERE syntax instead, where "?" and "+" are universally supported: $ grep -E 'xy?' f; echo $? xy 0 1. 2ed5c8e174 ("describe: setup working tree for --dirty", 2019-02-03) 2. c801170b0c ("t6120: test for describe with a bare repository", 2019-02-03) Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2019, 04:58:19 UTC |
| 54fca18 | Jiang Xin | 20 February 2019, 13:40:54 UTC | Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po | 20 February 2019, 13:40:54 UTC |
| 8e4e055 | Fangyi Zhou | 11 February 2019, 11:28:55 UTC | l10n: zh_CN: Revision for git v2.21.0 l10n Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe> | 20 February 2019, 13:33:56 UTC |
| 0699177 | Jiang Xin | 20 November 2018, 02:18:06 UTC | l10n: zh_CN: for git v2.21.0 l10n round 1~2 Translate 214 new messages (4363t0f0u) for git 2.21.0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 20 February 2019, 13:33:56 UTC |
| c2d8f4c | Nguyễn Thái Ngọc Duy | 20 February 2019, 09:59:24 UTC | l10n: bg.po: correct typo Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 20 February 2019, 13:32:40 UTC |
| 34692d2 | Peter Krefting | 11 February 2019, 21:34:05 UTC | l10n: Update Swedish translation (4363t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 20 February 2019, 07:56:20 UTC |
| 35ee755 | Junio C Hamano | 19 February 2019, 21:20:23 UTC | Git 2.21-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2019, 21:20:23 UTC |
| c5b456b | Junio C Hamano | 19 February 2019, 21:18:08 UTC | Merge branch 'js/test-tool-gen-nuls' * js/test-tool-gen-nuls: tests: teach the test-tool to generate NUL bytes and use it | 19 February 2019, 21:18:08 UTC |
| 2c804ff | Junio C Hamano | 19 February 2019, 21:18:08 UTC | Merge branch 'mk/t5562-no-input-to-too-large-an-input-test' * mk/t5562-no-input-to-too-large-an-input-test: t5562: do not depend on /dev/zero Revert "t5562: replace /dev/zero with a pipe from generate_zero_bytes" | 19 February 2019, 21:18:08 UTC |
| 455d0be | Junio C Hamano | 19 February 2019, 21:18:08 UTC | Merge branch 'mk/t5562-do-not-reuse-output-files' * mk/t5562-do-not-reuse-output-files: t5562: do not reuse output files | 19 February 2019, 21:18:08 UTC |
| 0539071 | Max Kirillov | 24 November 2018, 09:37:19 UTC | t5562: do not reuse output files Some expected failures of git-http-backend leaves running its children (receive-pack or upload-pack) which still hold opened descriptors to act.err and with some probability they live long enough to write there their failure messages after next test has already truncated the files. This causes occasional failures of the test script. Avoid the issue by using separated output and error file for each test, apprending the test number to their name. Reported-by: Carlo Arenas <carenas@gmail.com> Helped-by: Carlo Arenas <carenas@gmail.com> Helped-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2019, 21:04:37 UTC |
| d5cfd14 | Johannes Schindelin | 14 February 2019, 21:33:12 UTC | tests: teach the test-tool to generate NUL bytes and use it In cc95bc2025 (t5562: replace /dev/zero with a pipe from generate_zero_bytes, 2019-02-09), we replaced usage of /dev/zero (which is not available on NonStop, apparently) by a Perl script snippet to generate NUL bytes. Sadly, it does not seem to work on NonStop, as t5562 reportedly hangs. Worse, this also hangs in the Ubuntu 16.04 agents of the CI builds on Azure Pipelines: for some reason, the Perl script snippet that is run via `generate_zero_bytes` in t5562's 'CONTENT_LENGTH overflow ssite_t' test case tries to write out an infinite amount of NUL bytes unless a broken pipe is encountered, that snippet never encounters the broken pipe, and keeps going until the build times out. Oddly enough, this does not reproduce on the Windows and macOS agents, nor in a local Ubuntu 18.04. This developer tried for a day to figure out the exact circumstances under which this hang happens, to no avail, the details remain a mystery. In the end, though, what counts is that this here change incidentally fixes that hang (maybe also on NonStop?). Even more positively, it gets rid of yet another unnecessary Perl invocation. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2019, 18:22:21 UTC |
| 7094175 | Max Kirillov | 15 February 2019, 16:42:37 UTC | t5562: do not depend on /dev/zero It was reported [1] that NonStop platform does not have /dev/zero. The test uses /dev/zero as a dummy input. Passing case (http-backed failed because of too big input size) should not be reading anything from it. If http-backend would erroneously try to read any data returning EOF probably would be even safer than providing some meaningless data. Replace /dev/zero with /dev/null to avoid issues with platforms which do not have /dev/zero. [1] https://public-inbox.org/git/20190209185930.5256-4-randall.s.becker@rogers.com/ Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2019, 18:19:32 UTC |
| d991948 | Junio C Hamano | 19 February 2019, 18:18:15 UTC | Revert "t5562: replace /dev/zero with a pipe from generate_zero_bytes" Revert cc95bc20 ("t5562: replace /dev/zero with a pipe from generate_zero_bytes", 2019-02-09), as not feeding anything to the command is a better way to test it. | 19 February 2019, 18:19:22 UTC |
| a8a6b15 | Sebastian Staudt | 03 February 2019, 10:33:39 UTC | l10n: de.po: fix grammar in message for tag.c Signed-off-by: Sebastian Staudt <koraktor@gmail.com> | 19 February 2019, 12:53:29 UTC |
| 40cbe8a | Sebastian Staudt | 03 February 2019, 10:32:20 UTC | l10n: de.po: fix a message for index-pack.c Signed-off-by: Sebastian Staudt <koraktor@gmail.com> | 19 February 2019, 12:53:29 UTC |
| 567349f | Sebastian Staudt | 03 February 2019, 10:21:14 UTC | l10n: de.po: consistent translation of 'root commit' 'root commit' is usually translated as 'Root-Commit'. But in one occasion it‘s translated as 'Basis-Commit' which is the translation for 'base commit'. Signed-off-by: Sebastian Staudt <koraktor@gmail.com> | 19 February 2019, 12:53:29 UTC |
| bb236fb | Alessandro Menti | 17 February 2019, 17:04:51 UTC | l10n: it: update the Italian translation Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it> | 19 February 2019, 02:07:24 UTC |
| 10e6e9f | Jiang Xin | 17 February 2019, 07:28:15 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po | 17 February 2019, 07:28:15 UTC |
| cf69bca | Christopher Diaz Riveros | 06 February 2019, 13:36:53 UTC | l10n: es: 2.21.0 round 2 Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org> | 16 February 2019, 20:22:07 UTC |
| 9922d5c | Jiang Xin | 16 February 2019, 01:54:53 UTC | Merge branch 'fr_2.21.0_rnd2' of git://github.com/jnavila/git | 16 February 2019, 01:54:53 UTC |
| 4953cf6 | Jimmy Angelakos | 15 February 2019, 02:28:19 UTC | l10n: el: add Greek l10n team and essential translations Signed-off-by: Jimmy Angelakos <vyruss@hellug.gr> | 16 February 2019, 01:49:53 UTC |
| b3225a4 | Jean-Noël Avila | 13 February 2019, 19:35:13 UTC | l10n: fr.po v2.21.0 rnd 2 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> | 15 February 2019, 21:19:50 UTC |
| 02705d3 | Fabien Villepinte | 20 December 2018, 08:59:45 UTC | l10n: fr.po Fix some typos from round3 Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com> | 15 February 2019, 21:14:23 UTC |
| 5a05494 | Fabien Villepinte | 17 December 2018, 11:51:58 UTC | l10n: fr.po Fix some typos Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com> | 15 February 2019, 21:14:23 UTC |
| ca1b411 | Johannes Schindelin | 15 February 2019, 15:17:45 UTC | mingw: safe-guard a bit more against getenv() problems Running up to v2.21.0, we fixed two bugs that were made prominent by the Windows-specific change to retain copies of only the 30 latest getenv() calls' returned strings, invalidating any copies of previous getenv() calls' return values. While this really shines a light onto bugs of the form where we hold onto getenv()'s return values without copying them, it is also a real problem for users. And even if Jeff King's patches merged via 773e408881 (Merge branch 'jk/save-getenv-result', 2019-01-29) provide further work on that front, we are far from done. Just one example: on Windows, we unset environment variables when spawning new processes, which potentially invalidates strings that were previously obtained via getenv(), and therefore we have to duplicate environment values that are somehow involved in spawning new processes (e.g. GIT_MAN_VIEWER in show_man_page()). We do not have a chance to investigate, let address, all of those issues in time for v2.21.0, so let's at least help Windows users by increasing the number of getenv() calls' return values that are kept valid. The number 64 was determined by looking at the average number of getenv() calls per process in the entire test suite run on Windows (which is around 40) and then adding a bit for good measure. And it is a power of two (which would have hit yesterday's theme perfectly). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2019, 18:25:28 UTC |
| bdc017d | Jordi Mas | 15 February 2019, 15:43:59 UTC | l10n: Fixes to Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 15 February 2019, 15:43:59 UTC |
| 7f95bc7 | Jiang Xin | 15 February 2019, 02:12:14 UTC | l10n: git.pot: v2.21.0 round 2 (3 new, 3 removed) Introduce 3 update messages for v2.21.0 l10n round 2 from commit 32ceace39f (Fix typos in translatable strings for v2.21.0, 2019-02-11). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 February 2019, 02:21:59 UTC |
| a603d94 | Jiang Xin | 15 February 2019, 02:09:07 UTC | Merge branch 'master' of git://git.kernel.org/pub/scm/git/git | 15 February 2019, 02:09:07 UTC |
| 2d08f3d | Junio C Hamano | 14 February 2019, 22:28:22 UTC | Merge branch 'ea/rebase-compat-doc-fix' * ea/rebase-compat-doc-fix: docs/git-rebase: remove redundant entry in incompatible options list | 14 February 2019, 22:28:22 UTC |
| 4e09a7b | Junio C Hamano | 14 February 2019, 22:28:21 UTC | Merge branch 'jc/no-grepping-for-strerror-in-tests' * jc/no-grepping-for-strerror-in-tests: t1404: do not rely on the exact phrasing of strerror() | 14 February 2019, 22:28:21 UTC |
| f1e112a | Junio C Hamano | 14 February 2019, 22:28:20 UTC | Merge branch 'jt/fetch-v2-sideband' "git fetch" and "git upload-pack" learned to send all exchange over the sideband channel while talking the v2 protocol. * jt/fetch-v2-sideband: t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache | 14 February 2019, 22:28:21 UTC |
| 6f07c7b | Junio C Hamano | 14 February 2019, 22:28:20 UTC | Merge branch 'en/rebase-merge-on-sequencer' "git rebase --merge" as been reimplemented by reusing the internal machinery used for "git rebase -i". * en/rebase-merge-on-sequencer: git-rebase.txt: update to reflect merge now implemented on sequencer | 14 February 2019, 22:28:20 UTC |
| 29d03f8 | Elijah Newren | 14 February 2019, 20:25:41 UTC | git-rebase.txt: update to reflect merge now implemented on sequencer Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', 2019-02-06), --merge now uses the interactive backend (and matches its behavior) so there is no separate merge backend anymore. Fix an oversight in the docs that should have been updated with the previous change. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2019, 21:23:58 UTC |
| e18edc7 | Todd Zullinger | 14 February 2019, 06:35:13 UTC | t/lib-httpd: pass GIT_TEST_SIDEBAND_ALL through Apache 07c3c2aa16 ("tests: define GIT_TEST_SIDEBAND_ALL", 2019-01-16) added GIT_TEST_SIDEBAND_ALL to the apache.conf PassEnv list. Avoid warnings from Apache when the variable is unset, as we do for GIT_VALGRIND* and GIT_TRACE, from f628825481 ("t/lib-httpd: handle running under --valgrind", 2012-07-24) and 89c57ab3f0 ("t: pass GIT_TRACE through Apache", 2015-03-13), respectively. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2019, 21:18:20 UTC |
| c777cd8 | Junio C Hamano | 14 February 2019, 20:16:20 UTC | t1404: do not rely on the exact phrasing of strerror() Not even in C locale, it is wrong to expect that the exact phrasing "File exists" is used to show EEXIST. Reported-by: Randall S. Becker <rsbecker@nexbridge.com> Helped-by: Duy Nguyen <pclouds@gmail.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2019, 20:17:38 UTC |
| b83ffbd | Emilio Cobos Álvarez | 13 February 2019, 23:44:33 UTC | docs/git-rebase: remove redundant entry in incompatible options list The --autosquash option is implied by the earlier --[no-]autosquash entry in the list. Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2019, 19:54:27 UTC |
| 8989e19 | Junio C Hamano | 14 February 2019, 02:18:11 UTC | Git 2.21-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2019, 02:18:43 UTC |
| 6e47188 | Junio C Hamano | 14 February 2019, 02:18:43 UTC | Merge branch 'ab/rebase-test-fix' * ab/rebase-test-fix: rebase: fix regression in rebase.useBuiltin=false test mode | 14 February 2019, 02:18:43 UTC |
| b46221f | Junio C Hamano | 14 February 2019, 02:18:43 UTC | Merge branch 'rb/no-dev-zero-in-test' * rb/no-dev-zero-in-test: t5562: replace /dev/zero with a pipe from generate_zero_bytes t5318: replace use of /dev/zero with generate_zero_bytes test-lib-functions.sh: add generate_zero_bytes function | 14 February 2019, 02:18:43 UTC |
| f26493b | Junio C Hamano | 14 February 2019, 02:18:43 UTC | Merge branch 'rs/bash-is-in-coreutils-on-nonstop' * rs/bash-is-in-coreutils-on-nonstop: config.mak.uname: move location of bash on NonStop to CoreUtils | 14 February 2019, 02:18:43 UTC |
| 8593e8a | Junio C Hamano | 14 February 2019, 02:18:43 UTC | Merge branch 'js/mingw-host-cpu' Windows update. * js/mingw-host-cpu: mingw: use a more canonical method to fix the CPU reporting | 14 February 2019, 02:18:43 UTC |
| feb9a9b | Junio C Hamano | 14 February 2019, 02:18:42 UTC | Merge branch 'sg/stress-test' Test improvement. * sg/stress-test: test-lib: fix non-portable pattern bracket expressions test-lib: make '--stress' more bisect-friendly | 14 February 2019, 02:18:42 UTC |
| 29825a8 | Junio C Hamano | 14 February 2019, 02:18:42 UTC | Merge branch 'kd/t0028-octal-del-is-377-not-777' Test fix. * kd/t0028-octal-del-is-377-not-777: t0028: fix wrong octal values for BOM in setup | 14 February 2019, 02:18:42 UTC |
| 18f9fb6 | Junio C Hamano | 14 February 2019, 02:18:41 UTC | Merge branch 'bc/utf16-portability-fix' The code and tests assume that the system supplied iconv() would always use BOM in its output when asked to encode to UTF-16 (or UTF-32), but apparently some implementations output big-endian without BOM. A compile-time knob has been added to help such systems (e.g. NonStop) to add BOM to the output to increase portability. * bc/utf16-portability-fix: utf8: handle systems that don't write BOM for UTF-16 | 14 February 2019, 02:18:41 UTC |
| 1db999c | Junio C Hamano | 14 February 2019, 02:18:41 UTC | Merge branch 'nd/fileno-may-be-macro' * nd/fileno-may-be-macro: git-compat-util: work around fileno(fp) that is a macro | 14 February 2019, 02:18:41 UTC |
| c73472a | Junio C Hamano | 14 February 2019, 02:18:41 UTC | Merge branch 'nd/get-oid-with-context-returns-an-enum' * nd/get-oid-with-context-returns-an-enum: get_oid_with_context(): match prototype and implementation | 14 February 2019, 02:18:41 UTC |
| 8ac5444 | Junio C Hamano | 14 February 2019, 02:18:41 UTC | Merge branch 'rj/sequencer-sign-off-header-static' Code clean-up. * rj/sequencer-sign-off-header-static: sequencer: make sign_off_header a file local symbol | 14 February 2019, 02:18:41 UTC |
| 9aea5e9 | Ævar Arnfjörð Bjarmason | 13 February 2019, 21:49:08 UTC | rebase: fix regression in rebase.useBuiltin=false test mode Fix a recently introduced regression in c762aada1a ("rebase -x: sanity check command", 2019-01-29) triggered when running the tests with GIT_TEST_REBASE_USE_BUILTIN=false. See 62c23938fa ("tests: add a special setup where rebase.useBuiltin is off", 2018-11-14) for how that test mode works. As discussed on-list[1] it's not worth it to implement the sanity check in the legacy rebase code, we plan to remove it after the 2.21 release. So let's do the bare minimum to make the tests pass under the GIT_TEST_REBASE_USE_BUILTIN=false special setup. 1. https://public-inbox.org/git/xmqqva1nbeno.fsf@gitster-ct.c.googlers.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 23:16:21 UTC |
| bb02e7a | Johannes Schindelin | 13 February 2019, 10:19:49 UTC | mingw: use a more canonical method to fix the CPU reporting In `git version --build-options`, we report also the CPU, but in Git for Windows we actually cross-compile the 32-bit version in a 64-bit Git for Windows, so we cannot rely on the auto-detected value. In 3815f64b0dd9 (mingw: fix CPU reporting in `git version --build-options`, 2019-02-07), we fixed this by a Windows-only workaround, making use of magic pre-processor constants, which works in GCC, but most likely not all C compilers. As pointed out by Eric Sunshine, there is a better way, anyway: to set the Makefile variable HOST_CPU explicitly for cross-compiled Git. So let's do that! This reverts commit 3815f64b0dd983bdbf9242a0547706d5d81cb3e6 partially. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 21:46:58 UTC |
| d38722e | Ævar Arnfjörð Bjarmason | 13 February 2019, 11:59:51 UTC | tests: avoid syntax triggering old dash bug Avoid a bug in dash that's been fixed ever since its ec2c84d ("[PARSER] Fix clobbering of checkkwd", 2011-03-15)[1] first released with dash v0.5.7 in July 2011. This failing test was introduced in 5f9674243d ("config: add --expiry-date", 2017-11-18). This fixes 1/2 tests failing on Debian Lenny & Squeeze. The other failure is due to 1b42f45255 ("git-svn: apply "svn.pathnameencoding" before URL encoding", 2016-02-09). The dash bug is triggered by this test because the heredoc contains a command embedded in "$()" with a "{}" block coming right after it. Refactoring the "$()" to e.g. be a variable that was set earlier will also work around it, but let's instead break up the "EOF" and the "{}". An earlier version of this patch[2] mitigated the issue by breaking the "$()" out of the "{}" block, that worked, but just because it broke up the "EOF" and "{}" block. Putting e.g. "echo &&" between the two would also work. 1. https://git.kernel.org/pub/scm/utils/dash/dash.git/ 2. https://public-inbox.org/git/20181127164253.9832-1-avarab@gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 21:46:06 UTC |
| f0ec22b | Randall S. Becker | 09 February 2019, 17:26:11 UTC | config.mak.uname: move location of bash on NonStop to CoreUtils The default bash is now officially in /usr/coreutils/bin instead of in /usr/local/bin. This version of bash is more stable and recommended for all use as of the J06.22 and L18.02 operating system revision levels. This new version provides more stability of test results. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 20:54:39 UTC |
| cc95bc2 | Randall S. Becker | 09 February 2019, 18:59:30 UTC | t5562: replace /dev/zero with a pipe from generate_zero_bytes To help platforms that lack /dev/zero (e.g. NonStop), replace use of /dev/zero to feed "git http-backend" with a pipe of output from the generate_zero_bytes helper. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 17:26:31 UTC |
| 24b451e | Randall S. Becker | 09 February 2019, 18:59:29 UTC | t5318: replace use of /dev/zero with generate_zero_bytes There are platforms (e.g. NonStop) that lack /dev/zero; use the generate_zero_bytes helper we just introduced to append stream of NULs at the end of the file. The original, even though it uses "dd seek=... count=..." to make it look like it is overwriting the middle part of an existing file, has truncated the file before this step with another use of "dd", which may make it tricky to see why this rewrite is a correct one. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2019, 17:23:45 UTC |
| 127b48f | Duy Nguyen | 12 February 2019, 12:43:23 UTC | get_oid_with_context(): match prototype and implementation The get_oid_with_context() function is declared to return an enum in cache.h, but defined to return an int in sha1-name.c. The compiler notices this on AIX and rejects the build, since d1dd94b308 (Do not print 'dangling' for cat-file in case of ambiguity - 2019-01-17) was merged. Return the correct type from the implementation to fix this. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 18:14:56 UTC |
| 18a4f6b | Duy Nguyen | 12 February 2019, 14:14:41 UTC | git-compat-util: work around fileno(fp) that is a macro On various BSD's, fileno(fp) is implemented as a macro that directly accesses the fields in the FILE * object, which breaks a function that accepts a "void *fp" parameter and calls fileno(fp) and expect it to work. Work it around by adding a compile-time knob FILENO_IS_A_MACRO that inserts a real helper function in the middle of the callchain. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 18:01:59 UTC |
| b0fa1a3 | Randall S. Becker | 09 February 2019, 18:59:28 UTC | test-lib-functions.sh: add generate_zero_bytes function t5318 and t5562 used /dev/zero, which is not portable. This function provides both a fixed block of NUL bytes and an infinite stream of NULs. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 17:09:06 UTC |
| e9bd4aa | Jeff King | 12 February 2019, 06:33:04 UTC | RelNotes/2.21: misc typo/English fixups These are just some small fixes I noticed doing a complete read-through (there are a few cases I left that are incomplete or abbreviated sentences, but I think those are OK in this sort of bullet-list style). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 17:00:33 UTC |
| b9b17d3 | Jeff King | 12 February 2019, 06:32:48 UTC | RelNotes/2.21: tweak "--date=auto" mention In the feature that was eventually committed, "--date=auto" doesn't do anything. It was generalized to "--date=auto:<format>". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 17:00:32 UTC |
| d3c4e32 | Junio C Hamano | 12 February 2019, 17:00:25 UTC | Merge branch 'nd/imap-send-typofix' * nd/imap-send-typofix: imap-send.c: add a missing space in error message | 12 February 2019, 17:00:25 UTC |
| 6d1fbf8 | Nguyễn Thái Ngọc Duy | 11 February 2019, 09:40:11 UTC | imap-send.c: add a missing space in error message Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 03:07:13 UTC |
| 79444c9 | brian m. carlson | 12 February 2019, 00:52:06 UTC | utf8: handle systems that don't write BOM for UTF-16 When serializing UTF-16 (and UTF-32), there are three possible ways to write the stream. One can write the data with a BOM in either big-endian or little-endian format, or one can write the data without a BOM in big-endian format. Most systems' iconv implementations choose to write it with a BOM in some endianness, since this is the most foolproof, and it is resistant to misinterpretation on Windows, where UTF-16 and the little-endian serialization are very common. For compatibility with Windows and to avoid accidental misuse there, Git always wants to write UTF-16 with a BOM, and will refuse to read UTF-16 without it. However, musl's iconv implementation writes UTF-16 without a BOM, relying on the user to interpret it as big-endian. This causes t0028 and the related functionality to fail, since Git won't read the file without a BOM. Add a Makefile and #define knob, ICONV_OMITS_BOM, that can be set if the iconv implementation has this behavior. When set, Git will write a BOM manually for UTF-16 and UTF-32 and then force the data to be written in UTF-16BE or UTF-32BE. We choose big-endian behavior here because the tests use the raw "UTF-16" encoding, which will be big-endian when the implementation requires this knob to be set. Update the tests to detect this case and write test data with an added BOM if necessary. Always write the BOM in the tests in big-endian format, since all iconv implementations that omit a BOM must use big-endian serialization according to the Unicode standard. Preserve the existing behavior for systems which do not have this knob enabled, since they may use optimized implementations, including defaulting to the native endianness, which may improve performance. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2019, 02:20:07 UTC |
| 99e9ab5 | Kevin Daudt | 11 February 2019, 21:38:18 UTC | t0028: fix wrong octal values for BOM in setup The setup code uses octal values with printf to generate a BOM for UTF-16/32 BE/LE. It specifically uses '\777' to emit a 0xff byte. This relies on the fact that most shells truncate the value above 0o377. Ash however interprets '\777' as '\77' + a literal '7', resulting in an invalid BOM. Fix this by using the proper value of 0xff: '\377'. Signed-off-by: Kevin Daudt <me@ikke.info> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2019, 22:46:36 UTC |
| 7d661e5 | SZEDER Gábor | 11 February 2019, 19:58:03 UTC | test-lib: fix non-portable pattern bracket expressions Use a '!' character to start a non-matching pattern bracket expression, as specified by POSIX in Shell Command Language section 2.13.1 Patterns Matching a Single Character [1]. I used '^' instead in three places in the previous three commits, to verify that the arguments of the '--stress=' and '--stress-limit=' options and the values of various '*_PORT' environment variables are valid numbers. With certain shells, at least with dash (upstream and in Ubuntu 14.04) and mksh, this led to various undesired behaviors: # error message in case of a valid number $ ~/src/dash/src/dash ./t3903-stash.sh --stress=8 error: --stress=<N> requires the number of jobs to run # not the expected error message $ ~/src/dash/src/dash ./t3903-stash.sh --stress=foo ./t3903-stash.sh: 238: test: Illegal number: foo # no error message at all?! $ mksh ./t3903-stash.sh --stress=foo $ echo $? 0 Some other shells, e.g. Bash (even in posix mode), ksh, dash in Ubuntu 16.04 or later, are apparently happy to accept '^' just as well. [1] http://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html#tag_02_13 Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2019, 22:34:36 UTC |
| 5fe8143 | Ramsay Jones | 11 February 2019, 17:16:58 UTC | sequencer: make sign_off_header a file local symbol Commit d0aaa46fd3 ("commit: move empty message checks to libgit", 2017-11-10) removes the last use of 'sign_off_header' outside of the "sequencer.c" source file. Remove the extern declaration from the header file and mark the definition of the symbol with the static keyword. Signed-off-by: Ramsay Jones <ramsay@ramsayjones.plus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2019, 21:10:57 UTC |
| 243a4c7 | Randall S. Becker | 10 February 2019, 00:20:16 UTC | config.mak.uname: add FREAD_READS_DIRECTORIES for NonStop platform The NonStop platform needs this configuration item specified as UnfortunatelyYes so that config directory files are correctly processed. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2019, 20:58:49 UTC |
| 32ceace | Jean-Noël Avila | 11 February 2019, 06:44:53 UTC | Fix typos in translatable strings for v2.21.0 Signed-off-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2019, 20:58:06 UTC |
| 94328ce | Jiang Xin | 09 February 2019, 12:54:56 UTC | l10n: git.pot: v2.21.0 round 1 (214 new, 38 removed) Generate po/git.pot from v2.21.0-rc0-30-g11ad41d4cb (Seventh batch for 2.21) for git v2.21.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 09 February 2019, 12:54:56 UTC |
| 70015a5 | Jiang Xin | 09 February 2019, 12:53:46 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po | 09 February 2019, 12:53:46 UTC |
| 11ad41d | Junio C Hamano | 09 February 2019, 04:45:48 UTC | Seventh batch for 2.21 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2019, 04:45:48 UTC |
| 6951c5f | Junio C Hamano | 09 February 2019, 04:44:53 UTC | Merge branch 'js/mingw-host-cpu' Windows update. * js/mingw-host-cpu: mingw: fix CPU reporting in `git version --build-options` | 09 February 2019, 04:44:53 UTC |
| 8f6399e | Junio C Hamano | 09 February 2019, 04:44:53 UTC | Merge branch 'js/fuzz-commit-graph-update' Update to the fuzzer. * js/fuzz-commit-graph-update: object: fix leak of shallow_stat fuzz-commit-graph: initialize repo object | 09 February 2019, 04:44:53 UTC |
| ca9103d | Junio C Hamano | 09 February 2019, 04:44:52 UTC | Merge branch 'kl/pretty-doc-markup-fix' Doc update. * kl/pretty-doc-markup-fix: doc: prevent overflowing <code> tag in rendered HTML | 09 February 2019, 04:44:53 UTC |
| 19116cd | Junio C Hamano | 09 February 2019, 04:44:52 UTC | Merge branch 'sg/ci-parallel-build' Build update. * sg/ci-parallel-build: ci: clear and mark MAKEFLAGS exported just once ci: make sure we build Git parallel | 09 February 2019, 04:44:52 UTC |
| 0be2f36 | Junio C Hamano | 09 February 2019, 04:44:52 UTC | Merge branch 'ld/git-p4-remove-flakey-test' A flakey "p4" test has been removed. * ld/git-p4-remove-flakey-test: git-p4: remove ticket expiry test | 09 February 2019, 04:44:52 UTC |
| b966813 | Junio C Hamano | 09 February 2019, 04:44:52 UTC | Merge branch 'js/rebase-i-redo-exec-fix' For "rebase -i --reschedule-failed-exec", we do not want the "-y" shortcut after all. * js/rebase-i-redo-exec-fix: Revert "rebase: introduce a shortcut for --reschedule-failed-exec" | 09 February 2019, 04:44:52 UTC |
| 87c9831 | Junio C Hamano | 09 February 2019, 04:44:51 UTC | Merge branch 'nd/checkout-noisy-unmerge' "git checkout [<tree-ish>] <pathspec>" started reporting the number of paths that have got updated recently, but the same messages were given when "git checkout -m <pathspec>" to unresolve conflicts that have just been resolved. The message now reports these unresolved paths separately from the paths that are checked out from the index. * nd/checkout-noisy-unmerge: checkout: count and print -m paths separately checkout: update count-checkouts messages | 09 February 2019, 04:44:51 UTC |
| fd357c4 | Junio C Hamano | 09 February 2019, 04:44:51 UTC | Merge branch 'js/smart-http-detect-remote-error' Some errors from the other side coming over smart HTTP transport were not noticed, which has been corrected. * js/smart-http-detect-remote-error: t5551: test server-side ERR packet remote-curl: tighten "version 2" check for smart-http remote-curl: refactor smart-http discovery | 09 February 2019, 04:44:51 UTC |
| 5a5f408 | Junio C Hamano | 09 February 2019, 04:44:51 UTC | Merge branch 'ds/coverage-prove' A new target "coverage-prove" to run the coverage test under "prove" has been added. * ds/coverage-prove: Makefile: add coverage-prove target | 09 February 2019, 04:44:51 UTC |
| 154f220 | Junio C Hamano | 09 February 2019, 04:44:50 UTC | Merge branch 'tz/gpg-test-fix' Test fix. * tz/gpg-test-fix: t/lib-gpg: drop redundant killing of gpg-agent t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt | 09 February 2019, 04:44:51 UTC |
| d379d46 | Junio C Hamano | 09 February 2019, 04:44:50 UTC | Merge branch 'os/rebase-runs-post-checkout-hook' Test fix. * os/rebase-runs-post-checkout-hook: t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIR | 09 February 2019, 04:44:50 UTC |
| 76e27fb | SZEDER Gábor | 08 February 2019, 11:50:45 UTC | test-lib: make '--stress' more bisect-friendly Let's suppose that a test somehow becomes flaky between 'master' and 'pu', and tends to fail within the first 50 repetitions when run with '--stress'. In such a case we could use 'git bisect' to find the culprit: if the test script fails with '--stress', then the commit is definitely bad, but if it survives, say, 300 repetitions, then we could consider it good with reasonable confidence. Unfortunately, all this could only be done manually, because '--stress' would run the test script repeatedly for all eternity on a good commit, and it would exit with success even when it found a failure on a bad commit. So let's make '--stress' usable with 'git bisect run': - Make it exit with failure if a failure is found. - Add the '--stress-limit=<N>' option to repeat the test script at most N times in each of the parallel jobs, and exit with success when the limit is reached. And then we could simply run something like: $ git bisect start origin/pu master $ git bisect run sh -c 'make && cd t && ./t1234-foo.sh --stress --stress-limit=300' Sure, as a brand new feature it won't be any useful right now, but in a release or three most cooking topics will already contain this, so we could automatically bisect at least newly introduced flakiness. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2019, 19:57:59 UTC |
| a250d41 | Randall S. Becker | 08 February 2019, 11:32:33 UTC | t5403: correct bash ambiguous redirect error in subtest 8 by quoting $GIT_DIR The embedded blanks in the full path of the test git repository cased bash to generate an ambugious redirect error. Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2019, 19:53:49 UTC |
| e3fd181 | Johannes Schindelin | 08 February 2019, 10:01:20 UTC | .mailmap: map Clemens Buchacher's mail addresses We have three email addresses for Clemens in our commit history, two of them bouncing. Let's map the latter to the only one that still works. Pointed out by Gábor Szeder. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2019, 19:14:15 UTC |
| 2e285e7 | Todd Zullinger | 08 February 2019, 03:17:46 UTC | t/lib-gpg: drop redundant killing of gpg-agent In 53fc999306 ("gpg-interface t: extend the existing GPG tests with GPGSM", 2018-07-20), the gpgconf call which kills gpg-agent was copied from the existing gpg setup code. The reason for killing gpg-agent is given in 29ff1f8f74 ("t: lib-gpg: flush gpg agent on startup", 2017-07-20): When running gpg-relevant tests, a gpg-daemon is spawned for each GNUPGHOME used. This daemon may stay running after the test and cache file descriptors for the trash directories, even after the trash directory is removed. This leads to ENOENT errors when attempting to create files if tests are run multiple times. Add a cleanup script to force flushing the gpg-agent for that GNUPGHOME (if any) before setting up the GPG relevant-environment. Killing gpg-agent once per test is sufficient. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2019, 18:01:46 UTC |
| ddf3a11 | Todd Zullinger | 08 February 2019, 03:17:45 UTC | t/lib-gpg: quote path to ${GNUPGHOME}/trustlist.txt When gpgsm is installed, lib-gpg.sh attempts to update trustlist.txt to relax the checking of some root certificate requirements. The path to "${GNUPGHOME}" contains spaces which cause an "ambiguous redirect" warning when bash is used to run the tests: $ bash t7030-verify-tag.sh /git/t/lib-gpg.sh: line 66: ${GNUPGHOME}/trustlist.txt: ambiguous redirect ok 1 - create signed tags ok 2 # skip create signed tags x509 (missing GPGSM) ... No warning is issued when using bash called as /bin/sh, dash, or mksh. Quote the path to ensure the redirect works as intended and sets the GPGSM prereq. While we're here, drop the space after ">>". Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2019, 18:01:39 UTC |
| 3815f64 | Johannes Schindelin | 07 February 2019, 10:46:06 UTC | mingw: fix CPU reporting in `git version --build-options` We cannot rely on `uname -m` in Git for Windows' SDK to tell us what architecture we are compiling for, as we can compile both 32-bit and 64-bit `git.exe` from a 64-bit SDK, but the `uname -m` in that SDK will always report `x86_64`. So let's go back to our original design. And make it explicitly Windows-specific. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2019, 21:05:37 UTC |
| 96b0710 | Josh Steadmon | 07 February 2019, 20:05:54 UTC | object: fix leak of shallow_stat In eee4502baaf ("shallow: migrate shallow information into the object parser", 2018-05-17), we added a stat_validity pointer into the parsed_object_pool struct, but did not add code to free this in parsed_object_pool_clear(). This leak was found by fuzz-commit-graph. Clear the struct and then free it in parsed_object_pool_clear() to prevent the leak. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2019, 21:02:28 UTC |
| 249dc53 | Josh Steadmon | 07 February 2019, 20:05:53 UTC | fuzz-commit-graph: initialize repo object Various #DEFINE "constants" in commit-graph.c now depend on the_hash_algo->rawsz, but this object must be initialized before it can be used. Signed-off-by: Josh Steadmon <steadmon@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2019, 21:02:26 UTC |
