Alexander Shopov [Sat, 23 Feb 2019 16:39:07 +0000 (18:39 +0200)]
l10n: bg.po: Updated Bulgarian translation (4363t)
Signed-off-by: Alexander Shopov <ash@kambanaria.org>
Jiang Xin [Fri, 22 Feb 2019 14:18:12 +0000 (22:18 +0800)]
Merge branch 'master' of https://github.com/ralfth/git-po-de
Ralf Thielow [Fri, 22 Feb 2019 07:45:40 +0000 (08:45 +0100)]
l10n: update German translation
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
Reviewed-by: Matthias Rüster <matthias.ruester@gmail.com>
Jiang Xin [Wed, 20 Feb 2019 13:40:54 +0000 (21:40 +0800)]
Merge branch 'bg-submodule-helper-typo' of github.com:pclouds/git-po
Fangyi Zhou [Mon, 11 Feb 2019 11:28:55 +0000 (11:28 +0000)]
l10n: zh_CN: Revision for git v2.21.0 l10n
Signed-off-by: Fangyi Zhou <fangyi.zhou@yuriko.moe>
Jiang Xin [Tue, 20 Nov 2018 02:18:06 +0000 (10:18 +0800)]
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>
Nguyễn Thái Ngọc Duy [Wed, 20 Feb 2019 09:59:24 +0000 (16:59 +0700)]
l10n: bg.po: correct typo
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Peter Krefting [Mon, 11 Feb 2019 21:34:05 +0000 (22:34 +0100)]
l10n: Update Swedish translation (4363t0f0u)
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
Sebastian Staudt [Sun, 3 Feb 2019 10:33:39 +0000 (11:33 +0100)]
l10n: de.po: fix grammar in message for tag.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
Sebastian Staudt [Sun, 3 Feb 2019 10:32:20 +0000 (11:32 +0100)]
l10n: de.po: fix a message for index-pack.c
Signed-off-by: Sebastian Staudt <koraktor@gmail.com>
Sebastian Staudt [Sun, 3 Feb 2019 10:21:14 +0000 (11:21 +0100)]
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>
Alessandro Menti [Sun, 17 Feb 2019 17:04:51 +0000 (18:04 +0100)]
l10n: it: update the Italian translation
Signed-off-by: Alessandro Menti <alessandro.menti@alessandromenti.it>
Jiang Xin [Sun, 17 Feb 2019 07:28:15 +0000 (15:28 +0800)]
Merge branch 'master' of https://github.com/Softcatala/git-po
Christopher Diaz Riveros [Wed, 6 Feb 2019 13:36:53 +0000 (08:36 -0500)]
l10n: es: 2.21.0 round 2
Signed-off-by: Christopher Diaz Riveros <chrisadr@gentoo.org>
Jiang Xin [Sat, 16 Feb 2019 01:54:53 +0000 (09:54 +0800)]
Merge branch 'fr_2.21.0_rnd2' of git://github.com/jnavila/git
Jimmy Angelakos [Fri, 15 Feb 2019 02:28:19 +0000 (02:28 +0000)]
l10n: el: add Greek l10n team and essential translations
Signed-off-by: Jimmy Angelakos <vyruss@hellug.gr>
Jean-Noël Avila [Wed, 13 Feb 2019 19:35:13 +0000 (20:35 +0100)]
l10n: fr.po v2.21.0 rnd 2
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Fabien Villepinte [Thu, 20 Dec 2018 08:59:45 +0000 (09:59 +0100)]
l10n: fr.po Fix some typos from round3
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
Fabien Villepinte [Mon, 17 Dec 2018 11:51:58 +0000 (12:51 +0100)]
l10n: fr.po Fix some typos
Signed-off-by: Fabien Villepinte <fabien.villepinte@gmail.com>
Jordi Mas [Fri, 15 Feb 2019 15:43:59 +0000 (16:43 +0100)]
l10n: Fixes to Catalan translation
Signed-off-by: Jordi Mas <jmas@softcatala.org>
Jiang Xin [Fri, 15 Feb 2019 02:12:14 +0000 (10:12 +0800)]
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>
Jiang Xin [Fri, 15 Feb 2019 02:09:07 +0000 (10:09 +0800)]
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
Junio C Hamano [Thu, 14 Feb 2019 22:28:22 +0000 (14:28 -0800)]
Merge branch 'ea/rebase-compat-doc-fix'
* ea/rebase-compat-doc-fix:
docs/git-rebase: remove redundant entry in incompatible options list
Junio C Hamano [Thu, 14 Feb 2019 22:28:21 +0000 (14:28 -0800)]
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()
Junio C Hamano [Thu, 14 Feb 2019 22:28:20 +0000 (14:28 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 22:28:20 +0000 (14:28 -0800)]
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
Elijah Newren [Thu, 14 Feb 2019 20:25:41 +0000 (12:25 -0800)]
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>
Todd Zullinger [Thu, 14 Feb 2019 06:35:13 +0000 (01:35 -0500)]
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>
Junio C Hamano [Thu, 14 Feb 2019 20:16:20 +0000 (12:16 -0800)]
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>
Emilio Cobos Álvarez [Wed, 13 Feb 2019 23:44:33 +0000 (00:44 +0100)]
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>
Junio C Hamano [Thu, 14 Feb 2019 02:18:11 +0000 (18:18 -0800)]
Git 2.21-rc1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)]
Merge branch 'ab/rebase-test-fix'
* ab/rebase-test-fix:
rebase: fix regression in rebase.useBuiltin=false test mode
Junio C Hamano [Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:43 +0000 (18:18 -0800)]
Merge branch 'js/mingw-host-cpu'
Windows update.
* js/mingw-host-cpu:
mingw: use a more canonical method to fix the CPU reporting
Junio C Hamano [Thu, 14 Feb 2019 02:18:42 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:42 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)]
Merge branch 'nd/fileno-may-be-macro'
* nd/fileno-may-be-macro:
git-compat-util: work around fileno(fp) that is a macro
Junio C Hamano [Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)]
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
Junio C Hamano [Thu, 14 Feb 2019 02:18:41 +0000 (18:18 -0800)]
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
Ævar Arnfjörð Bjarmason [Wed, 13 Feb 2019 21:49:08 +0000 (22:49 +0100)]
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>
Johannes Schindelin [Wed, 13 Feb 2019 10:19:49 +0000 (02:19 -0800)]
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>
Randall S. Becker [Sat, 9 Feb 2019 17:26:11 +0000 (12:26 -0500)]
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>
Randall S. Becker [Sat, 9 Feb 2019 18:59:30 +0000 (13:59 -0500)]
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>
Randall S. Becker [Sat, 9 Feb 2019 18:59:29 +0000 (13:59 -0500)]
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>
Duy Nguyen [Tue, 12 Feb 2019 12:43:23 +0000 (19:43 +0700)]
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>
Duy Nguyen [Tue, 12 Feb 2019 14:14:41 +0000 (21:14 +0700)]
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>
Randall S. Becker [Sat, 9 Feb 2019 18:59:28 +0000 (13:59 -0500)]
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>
Jeff King [Tue, 12 Feb 2019 06:33:04 +0000 (01:33 -0500)]
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>
Jeff King [Tue, 12 Feb 2019 06:32:48 +0000 (01:32 -0500)]
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>
Junio C Hamano [Tue, 12 Feb 2019 17:00:25 +0000 (09:00 -0800)]
Merge branch 'nd/imap-send-typofix'
* nd/imap-send-typofix:
imap-send.c: add a missing space in error message
Nguyễn Thái Ngọc Duy [Mon, 11 Feb 2019 09:40:11 +0000 (16:40 +0700)]
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>
brian m. carlson [Tue, 12 Feb 2019 00:52:06 +0000 (00:52 +0000)]
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>
Kevin Daudt [Mon, 11 Feb 2019 21:38:18 +0000 (22:38 +0100)]
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>
SZEDER Gábor [Mon, 11 Feb 2019 19:58:03 +0000 (20:58 +0100)]
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>
Ramsay Jones [Mon, 11 Feb 2019 17:16:58 +0000 (17:16 +0000)]
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>
Randall S. Becker [Sun, 10 Feb 2019 00:20:16 +0000 (19:20 -0500)]
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>
Jean-Noël Avila [Mon, 11 Feb 2019 06:44:53 +0000 (07:44 +0100)]
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>
Jiang Xin [Sat, 9 Feb 2019 12:54:56 +0000 (20:54 +0800)]
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>
Jiang Xin [Sat, 9 Feb 2019 12:53:46 +0000 (20:53 +0800)]
Merge branch 'master' of git://github.com/git-l10n/git-po
Junio C Hamano [Sat, 9 Feb 2019 04:45:48 +0000 (20:45 -0800)]
Seventh batch for 2.21
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Sat, 9 Feb 2019 04:44:53 +0000 (20:44 -0800)]
Merge branch 'js/mingw-host-cpu'
Windows update.
* js/mingw-host-cpu:
mingw: fix CPU reporting in `git version --build-options`
Junio C Hamano [Sat, 9 Feb 2019 04:44:53 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)]
Merge branch 'kl/pretty-doc-markup-fix'
Doc update.
* kl/pretty-doc-markup-fix:
doc: prevent overflowing <code> tag in rendered HTML
Junio C Hamano [Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:52 +0000 (20:44 -0800)]
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"
Junio C Hamano [Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:50 +0000 (20:44 -0800)]
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
Junio C Hamano [Sat, 9 Feb 2019 04:44:50 +0000 (20:44 -0800)]
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
SZEDER Gábor [Fri, 8 Feb 2019 11:50:45 +0000 (12:50 +0100)]
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>
Randall S. Becker [Fri, 8 Feb 2019 11:32:33 +0000 (06:32 -0500)]
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>
Johannes Schindelin [Fri, 8 Feb 2019 10:01:20 +0000 (02:01 -0800)]
.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>
Todd Zullinger [Fri, 8 Feb 2019 03:17:46 +0000 (22:17 -0500)]
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>
Todd Zullinger [Fri, 8 Feb 2019 03:17:45 +0000 (22:17 -0500)]
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>
Johannes Schindelin [Thu, 7 Feb 2019 10:46:06 +0000 (02:46 -0800)]
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>
Josh Steadmon [Thu, 7 Feb 2019 20:05:54 +0000 (12:05 -0800)]
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>
Josh Steadmon [Thu, 7 Feb 2019 20:05:53 +0000 (12:05 -0800)]
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>
Katrin Leinweber [Thu, 7 Feb 2019 19:16:37 +0000 (20:16 +0100)]
doc: prevent overflowing <code> tag in rendered HTML
Add an apparently missing back-tick to fix a multi-line <code> section
on https://git-scm.com/docs/git-log which seems to have been caused by
commit
18fb7ffc ("pretty: respect color settings [...]", 2017-07-13).
Signed-off-by: Katrin Leinweber <katrin.leinweber@uni-konstanz.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 7 Feb 2019 19:36:28 +0000 (11:36 -0800)]
ci: clear and mark MAKEFLAGS exported just once
Clearing it once upfront, and turning all the assignment into
appending, would future-proof the code even more, to prevent
mistakes the previous one fixed from happening again.
Also, mark the variable exported just once at the beginning. There
is no point in marking it exported repeatedly.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor [Thu, 7 Feb 2019 18:37:36 +0000 (19:37 +0100)]
ci: make sure we build Git parallel
Commit
2c8921db2b (travis-ci: build with the right compiler,
2019-01-17) started to use MAKEFLAGS to specify which compiler to use
to build Git. A bit later, and in a different topic branch commit
eaa62291ff (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests,
2019-01-27) started to use MAKEFLAGS as well. Unfortunately, there is
a semantic conflict between these two commits: both of them set
MAKEFLAGS, and since the line adding CC from
2c8921db2b comes later in
'ci/lib.sh', it overwrites the number of parallel jobs added in
eaa62291ff.
Consequently, since both commits have been merged all our CI jobs have
been building Git, building its documentation, and applying semantic
patches sequentially, making all build jobs a bit slower. Running
the test suite is unaffected, because the number of test jobs comes
from GIT_PROVE_OPTS.
Append to MAKEFLAGS when setting the compiler to use, to ensure that
the number of parallel jobs to use is preserved.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 7 Feb 2019 05:30:09 +0000 (21:30 -0800)]
Git 2.21-rc0
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano [Thu, 7 Feb 2019 06:05:30 +0000 (22:05 -0800)]
Merge branch 'jk/add-ignore-errors-bit-assignment-fix'
A hotfix to an incomplete fix made earlier.
* jk/add-ignore-errors-bit-assignment-fix:
add_to_index(): convert forgotten HASH_RENORMALIZE check
Junio C Hamano [Thu, 7 Feb 2019 06:05:30 +0000 (22:05 -0800)]
Merge branch 'rj/sparse-flags'
Use of the sparse tool got easier to customize from the command
line to help developers.
* rj/sparse-flags:
Makefile: improve SPARSE_FLAGS customisation
config.mak.uname: remove obsolete SPARSE_FLAGS setting
Junio C Hamano [Thu, 7 Feb 2019 06:05:30 +0000 (22:05 -0800)]
Merge branch 'bc/fetch-pack-clear-alternate-shallow'
"git fetch" over protocol v2 that needs to make a second connection
to backfill tags did not clear a variable that holds shallow
repository information correctly, leading to an access of freed
piece of memory.
* bc/fetch-pack-clear-alternate-shallow:
fetch-pack: clear alternate shallow in one more place
fetch-pack: clear alternate shallow when complete
Junio C Hamano [Thu, 7 Feb 2019 06:05:29 +0000 (22:05 -0800)]
Merge branch 'ma/doc-diff-usage-fix'
Running "Documentation/doc-diff x" from anywhere other than the
top-level of the working tree did not show the usage string
correctly, which has been fixed.
* ma/doc-diff-usage-fix:
doc-diff: don't `cd_to_toplevel`
Junio C Hamano [Thu, 7 Feb 2019 06:05:29 +0000 (22:05 -0800)]
Merge branch 'ab/diff-tree-doc-fix'
Doc fix.
* ab/diff-tree-doc-fix:
diff-tree doc: correct & remove wrong documentation
Junio C Hamano [Thu, 7 Feb 2019 06:05:29 +0000 (22:05 -0800)]
Merge branch 'ss/describe-dirty-in-the-right-directory'
"git --work-tree=$there --git-dir=$here describe --dirty" did not
work correctly as it did not pay attention to the location of the
worktree specified by the user by mistake, which has been
corrected.
* ss/describe-dirty-in-the-right-directory:
t6120: test for describe with a bare repository
describe: setup working tree for --dirty
Junio C Hamano [Thu, 7 Feb 2019 06:05:28 +0000 (22:05 -0800)]
Merge branch 'sg/travis-osx-brew-breakage-workaround'
The way the OSX build jobs updates its build environment used the
"--quiet" option to "brew update" command, but it wasn't all that
quiet to be useful. The use of the option has been replaced with
an explicit redirection to the /dev/null (which incidentally would
have worked around a breakage by recent updates to homebrew, which
has fixed itself already).
* sg/travis-osx-brew-breakage-workaround:
travis-ci: make the OSX build jobs' 'brew update' more quiet
Junio C Hamano [Thu, 7 Feb 2019 06:05:28 +0000 (22:05 -0800)]
Merge branch 'nd/commit-doc'
Doc update.
* nd/commit-doc:
git-commit.txt: better description what it does
Junio C Hamano [Thu, 7 Feb 2019 06:05:27 +0000 (22:05 -0800)]
Merge branch 'sl/const'
Code cleanup.
* sl/const:
various: tighten constness of some local variables
Junio C Hamano [Thu, 7 Feb 2019 06:05:27 +0000 (22:05 -0800)]
Merge branch 'sh/submodule-summary-abbrev-fix'
The "git submodule summary" subcommand showed shortened commit
object names by mechanically truncating them at 7-hexdigit, which
has been improved to let "rev-parse --short" scale the length of
the abbreviation with the size of the repository.
* sh/submodule-summary-abbrev-fix:
git-submodule.sh: shorten submodule SHA-1s using rev-parse
Junio C Hamano [Thu, 7 Feb 2019 06:05:27 +0000 (22:05 -0800)]
Merge branch 'nd/help-align-command-desc'
Output from "git help" was not correctly aligned, which has been
fixed.
* nd/help-align-command-desc:
help: align the longest command in the command listing
Junio C Hamano [Thu, 7 Feb 2019 06:05:27 +0000 (22:05 -0800)]
Merge branch 'jk/loose-object-cache-oid'
Code clean-up.
* jk/loose-object-cache-oid:
prefer "hash mismatch" to "sha1 mismatch"
sha1-file: avoid "sha1 file" for generic use in messages
sha1-file: prefer "loose object file" to "sha1 file" in messages
sha1-file: drop has_sha1_file()
convert has_sha1_file() callers to has_object_file()
sha1-file: convert pass-through functions to object_id
sha1-file: modernize loose header/stream functions
sha1-file: modernize loose object file functions
http: use struct object_id instead of bare sha1
update comment references to sha1_object_info()
sha1-file: fix outdated sha1 comment references
Junio C Hamano [Thu, 7 Feb 2019 06:05:26 +0000 (22:05 -0800)]
Merge branch 'pw/rebase-x-sanity-check'
"git rebase -x $cmd" did not reject multi-line command, even though
the command is incapable of handling such a command. It now is
rejected upfront.
* pw/rebase-x-sanity-check:
rebase -x: sanity check command
Junio C Hamano [Thu, 7 Feb 2019 06:05:26 +0000 (22:05 -0800)]
Merge branch 'js/vsts-ci'
Prepare to run test suite on Azure Pipeline.
* js/vsts-ci: (22 commits)
test-date: drop unused parameter to getnanos()
ci: parallelize testing on Windows
ci: speed up Windows phase
tests: optionally skip bin-wrappers/
t0061: workaround issues with --with-dashes and RUNTIME_PREFIX
tests: add t/helper/ to the PATH with --with-dashes
mingw: try to work around issues with the test cleanup
tests: include detailed trace logs with --write-junit-xml upon failure
tests: avoid calling Perl just to determine file sizes
README: add a build badge (status of the Azure Pipelines build)
mingw: be more generous when wrapping up the setitimer() emulation
ci: use git-sdk-64-minimal build artifact
ci: add a Windows job to the Azure Pipelines definition
Add a build definition for Azure DevOps
ci/lib.sh: add support for Azure Pipelines
tests: optionally write results as JUnit-style .xml
test-date: add a subcommand to measure times in shell scripts
ci: use a junction on Windows instead of a symlink
ci: inherit --jobs via MAKEFLAGS in run-build-and-tests
ci/lib.sh: encapsulate Travis-specific things
...
Junio C Hamano [Thu, 7 Feb 2019 06:05:25 +0000 (22:05 -0800)]
Merge branch 'br/commit-tree-fully-spelled-gpg-sign-option'
The documentation of "git commit-tree" said that the command
understands "--gpg-sign" in addition to "-S", but the command line
parser did not know about the longhand, which has been corrected.
* br/commit-tree-fully-spelled-gpg-sign-option:
commit-tree: add missing --gpg-sign flag
t7510: invoke git as part of &&-chain