Commit Graph

54820 Commits

Author SHA1 Message Date
Todd Zullinger
abd0f28983 test-lib: try harder to ensure a working jgit
The JGIT prereq uses `type jgit` to determine whether jgit is present.
While this is usually sufficient, it won't help if the jgit found is
badly broken.  This wastes time running tests which fail due to no fault
of our own.

Use `jgit --version` instead, to guard against cases where jgit is
present on the system, but will fail to run, e.g. because of some JRE
issue, or missing Java dependencies.  Checking that it gets far enough
to process the '--version' argument isn't perfect, but seems to be good
enough in practice.  It's also consistent with how we detect some other
dependencies, see e.g. the CURL and UNZIP prerequisites.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-05-15 14:20:01 +09:00
Johannes Schindelin
aeb582a983 mingw: allow building with an MSYS2 runtime v3.x
Recently the Git for Windows project started the upgrade process to
a MSYS2 runtime version based on Cygwin v3.x.

This has the very notable consequence that `$(uname -r)` no longer
reports a version starting with "2", but a version with "3".

That breaks our build, as df5218b4c3 (config.mak.uname: support MSys2,
2016-01-13) simply did not expect the version reported by `uname -r` to
depend on the underlying Cygwin version: it expected the reported
version to match the "2" in "MSYS2".

So let's invert that test case to test for *anything else* than a
version starting with "1" (for MSys). That should safeguard us for the
future, even if Cygwin ends up releasing versionsl like 314.272.65536.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-03-11 11:02:16 +09:00
Junio C Hamano
36eb1cb9cf L10n for Git 2.21.0 round 2.1
-----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCgA3FiEET/4dIHc7EQTOoGRdx6TpG3VEeigFAlx838YZHHdvcmxkaGVs
 bG8ubmV0QGdtYWlsLmNvbQAKCRDHpOkbdUR6KHevD/43gIJiWeg7J2aEqfp6hciW
 PHlDAHOkWJypAvwbUlPvwSb1svCIZMguddgKZfHAVq2181vbkIUXtXVSKPGJpkbe
 uFeE7RWmGEMcNpBLu84DGA1htfSzrc6hhWTHJNh5xvye59DS98qZuOGvHNMTmIYu
 3Mfatnogj+hiurYosnNnjPK72IC6rIglSmcSM1x9A16awwSxw+0nnza5oPvN2aOg
 bjpVTAS+rdhwjbLo8+pTDguIrTiK8fLrtjgXxXgfEjVxiGWObmBzsscF87I5rgk5
 63K0FaJRISH0A+nLpqghZhT8ZJNgdREPAN7/qv/l6moXJt6povN3TcZraQlVG8B6
 w2uReHDHsxJVT0fORrrZDTVjoDZn74RC64f5LF9I4sir8kBH0jaWnPNAbe1Jj3yb
 rZZcxKK2DTN0ql4Ef+91H6QfbK9Vh7dU4ymhaxM5Wfqip/cUO9feUaqhCt7kcxs5
 1C/USbsJuSzNSBRMG/QRJl7WkDOP0HC/moUyPHfbSKpBtzg6qA5L0Jjs3XhAtozr
 lqoLhaLeK+ChfM/zivOUPx+cxYlOGeyRqxWK6rzK6ctvpYEZ4aZC3HtMA5p9T3Fr
 SvsD9gSo7LPT21ffxh+BFo+5U4jPOjEi2gVQRhU5n6pPiCIVUofpWDgTmz85GzGj
 n7YzH4gCuJepsNK6vLC9Yw==
 =SDYM
 -----END PGP SIGNATURE-----

Merge tag 'l10n-2.21.0-rnd2.1' of git://github.com/git-l10n/git-po

L10n for Git 2.21.0 round 2.1

* tag 'l10n-2.21.0-rnd2.1' of git://github.com/git-l10n/git-po:
  l10n: Fixes to Catalan translation
  l10n: Updated Vietnamese translation for v2.21 rd2
  l10n: fr.po remove obsolete entries
2019-03-05 21:53:10 +09:00
Jordi Mas
3ece05c5f4 l10n: Fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-03-02 19:12:58 +01:00
Tran Ngoc Quan
1fc5279fdb l10n: Updated Vietnamese translation for v2.21 rd2
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2019-03-01 19:23:16 +08:00
Jean-Noël Avila
29b168aa44 l10n: fr.po remove obsolete entries
On NetBSD, the version of msgfmt is still 0.14.4. There's no hope for
an upgrade due to some GPLv3 allergy of NetBSD's. This version chokes
on heavily decorated commented entries in po files. It's safer to get
rid of all these obsolete entries.

Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-02-26 21:53:01 +01:00
Junio C Hamano
8104ec994e Git 2.21
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-24 07:55:19 -08:00
Junio C Hamano
572e460b7a Merge branch 'yn/checkout-doc-fix'
Doc fix.

* yn/checkout-doc-fix:
  checkout doc: fix an unmatched double-quote pair
2019-02-24 07:18:00 -08:00
Junio C Hamano
a1997dad1f l10n-2.21.0-rnd2
-----BEGIN PGP SIGNATURE-----
 
 iQJNBAABCgA3FiEET/4dIHc7EQTOoGRdx6TpG3VEeigFAlxyJB8ZHHdvcmxkaGVs
 bG8ubmV0QGdtYWlsLmNvbQAKCRDHpOkbdUR6KHP0D/98LexaqaOuXJJcJ6rqNtje
 PEzWoxz90XgbJxkRbV8bOxvWXW62YXSXICNhuAyN8o9DmdyXImRtJmYJMobHeliP
 L8+h0bS2jhak1+VEshUs7PR8K2y8UBGHeQGKyNMccsqCKUBTeZo4xlA7NW+VOC5j
 MzYcdSMG9MCV/eMgmT0KKle26IUM9JakZOSr/pfgSTtOsBQQUcI1RO/U4vobYtkc
 ExBWHh/+yl/Ear9FwyJEGfUJLfbfvDdbzeekoiGV7wR+syDb3ozbwgwOIH+RkT+k
 lRXtbHSwhH2wa2JlcOhieM2Z2cka50UkkI6ZqRXS3Tzczc5uUpOAdX4Ixs7gRLuX
 WPIWAxYyFRgVSBLbwUDcGYztrYpPIOF7BSxE1TlG9KplmjRa+w8FSarsdkKPD0hM
 ajRDmDjcaMNxbqi4t+TkBmK2Fgy162T/mRDA2nimyoPChE1DGuXoeFNrg0gNZ7tv
 u5q7mK4jljR2BCUWmCqSrG+pVFXjSEcoalt6Fhhq4AwU+njULpF/8zgIV+BNqLJi
 GrPiSEzrF+V1+UUof+rbyjFK7L24We0Hk9YREbuy2CMeqx+OCyCR1kBTYsmw+2IG
 AsEJRmcqOgdtv2wjWUicBlWd+a6Q4bxIfcTXVMBKtkCsmzj7ZHxTpQurfpu9yqt7
 obTGWSRTPvI8M3U1fB14hg==
 =2TXi
 -----END PGP SIGNATURE-----

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
2019-02-24 07:03:39 -08:00
Johannes Schindelin
39ffebd23b 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>
2019-02-23 21:27:04 -08:00
Yoichi Nakayama
c5c0a5ff1d 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>
2019-02-23 21:24:25 -08:00
Alexander Shopov
ab8f4f5d73 l10n: bg.po: Updated Bulgarian translation (4363t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
2019-02-23 23:29:23 +02:00
Junio C Hamano
c65a2884ea Merge branch 'ab/bsd-fixes'
Test portability fix.

* ab/bsd-fixes:
  commit-graph tests: fix unportable "dd" invocation
  tests: fix unportable "\?" and "\+" regex syntax
2019-02-22 21:20:19 -08:00
Junio C Hamano
60a3fbf500 Merge branch 'ab/workaround-dash-bug-in-test'
* ab/workaround-dash-bug-in-test:
  tests: avoid syntax triggering old dash bug
2019-02-22 21:20:19 -08:00
Ævar Arnfjörð Bjarmason
b9cc405612 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>
2019-02-22 11:20:56 -08:00
Jiang Xin
e7bc80b7ea Merge branch 'master' of https://github.com/ralfth/git-po-de 2019-02-22 22:18:12 +08:00
Ralf Thielow
e5a5d5c2c8 l10n: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
2019-02-22 08:47:26 +01:00
Ævar Arnfjörð Bjarmason
4abf20f004 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>
2019-02-21 20:58:19 -08:00
Jiang Xin
54fca18313 Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po 2019-02-20 21:40:54 +08:00
Fangyi Zhou
8e4e0555f2 l10n: zh_CN: Revision for git v2.21.0 l10n
Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
2019-02-20 21:33:56 +08:00
Jiang Xin
069917778f 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>
2019-02-20 21:33:56 +08:00
Nguyễn Thái Ngọc Duy
c2d8f4c73a l10n: bg.po: correct typo
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
2019-02-20 20:32:40 +07:00
Peter Krefting
34692d22fa l10n: Update Swedish translation (4363t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2019-02-20 08:56:20 +01:00
Junio C Hamano
35ee755a8c Git 2.21-rc2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-02-19 13:20:23 -08:00
Junio C Hamano
c5b456b4b8 Merge branch 'js/test-tool-gen-nuls'
* js/test-tool-gen-nuls:
  tests: teach the test-tool to generate NUL bytes and use it
2019-02-19 13:18:08 -08:00
Junio C Hamano
2c804ffe77 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"
2019-02-19 13:18:08 -08:00
Junio C Hamano
455d0beb13 Merge branch 'mk/t5562-do-not-reuse-output-files'
* mk/t5562-do-not-reuse-output-files:
  t5562: do not reuse output files
2019-02-19 13:18:08 -08:00
Max Kirillov
0539071b1e 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>
2019-02-19 13:04:37 -08:00
Johannes Schindelin
d5cfd142ec 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>
2019-02-19 10:22:21 -08:00
Max Kirillov
7094175075 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>
2019-02-19 10:19:32 -08:00
Junio C Hamano
d99194822b 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.
2019-02-19 10:19:22 -08:00
Sebastian Staudt
a8a6b15c01 l10n: de.po: fix grammar in message for tag.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
2019-02-19 13:53:29 +01:00
Sebastian Staudt
40cbe8ad14 l10n: de.po: fix a message for index-pack.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
2019-02-19 13:53:29 +01:00
Sebastian Staudt
567349f54e 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>
2019-02-19 13:53:29 +01:00
Alessandro Menti
bb236fb44a l10n: it: update the Italian translation
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
2019-02-19 10:07:24 +08:00
Jiang Xin
10e6e9fdea Merge branch 'master' of https://github.com/Softcatala/git-po 2019-02-17 15:28:15 +08:00
Christopher Diaz Riveros
cf69bcadee l10n: es: 2.21.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
2019-02-16 15:22:07 -05:00
Jiang Xin
9922d5c357 Merge branch 'fr_2.21.0_rnd2' of git://github.com/jnavila/git 2019-02-16 09:54:53 +08:00
Jimmy Angelakos
4953cf69a3 l10n: el: add Greek l10n team and essential translations
Signed-off-by: Jimmy Angelakos <vyruss@hellug.gr>
2019-02-16 09:49:53 +08:00
Jean-Noël Avila
b3225a4183 l10n: fr.po v2.21.0 rnd 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
2019-02-15 22:19:50 +01:00
Fabien Villepinte
02705d38d4 l10n: fr.po Fix some typos from round3
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
2019-02-15 22:14:23 +01:00
Fabien Villepinte
5a05494049 l10n: fr.po Fix some typos
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
2019-02-15 22:14:23 +01:00
Johannes Schindelin
ca1b411648 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>
2019-02-15 10:25:28 -08:00
Jordi Mas
bdc017d268 l10n: Fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
2019-02-15 16:43:59 +01:00
Jiang Xin
7f95bc7a20 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>
2019-02-15 10:21:59 +08:00
Jiang Xin
a603d9406e Merge branch 'master' of git://git.kernel.org/pub/scm/git/git 2019-02-15 10:09:07 +08:00
Junio C Hamano
2d08f3deb9 Merge branch 'ea/rebase-compat-doc-fix'
* ea/rebase-compat-doc-fix:
  docs/git-rebase: remove redundant entry in incompatible options list
2019-02-14 14:28:22 -08:00
Junio C Hamano
4e09a7b540 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()
2019-02-14 14:28:21 -08:00
Junio C Hamano
f1e112a758 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
2019-02-14 14:28:21 -08:00
Junio C Hamano
6f07c7b911 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
2019-02-14 14:28:20 -08:00