git/t, branch v2.14.2

Sync with 2.13.6

2017-09-22T05:50:02Z

Signed-off-by: Junio C Hamano

Sync with 2.12.5

2017-09-22T05:48:08Z

Signed-off-by: Junio C Hamano

Sync with 2.11.4

2017-09-22T05:45:30Z

Signed-off-by: Junio C Hamano

Sync with 2.10.5

2017-09-22T05:43:17Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/git-shell-drop-cvsserver' into maint-2.10

2017-09-22T05:34:34Z

shell: drop git-cvsserver support by default

2017-09-12T02:05:58Z

The git-cvsserver script is old and largely unmaintained these days. But git-shell allows untrusted users to run it out of the box, significantly increasing its attack surface. Let's drop it from git-shell's list of internal handlers so that it cannot be run by default. This is not backwards compatible. But given the age and development activity on CVS-related parts of Git, this is likely to impact very few users, while helping many more (i.e., anybody who runs git-shell and had no intention of supporting CVS). There's no configuration mechanism in git-shell for us to add a boolean and flip it to "off". But there is a mechanism for adding custom commands, and adding CVS support here is fairly trivial. Let's document it to give guidance to anybody who really is still running cvsserver. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'hv/t5526-andand-chain-fix' into maint

2017-09-10T08:03:05Z

Test fix. * hv/t5526-andand-chain-fix: t5526: fix some broken && chains

Merge branch 'rs/t1002-do-not-use-sum' into maint

2017-09-10T08:03:04Z

Test simplification. * rs/t1002-do-not-use-sum: t1002: stop using sum(1)

Merge branch 'rs/t3700-clean-leftover' into maint

2017-09-10T08:02:58Z

A test fix. * rs/t3700-clean-leftover: t3700: fix broken test under !POSIXPERM

Merge branch 'ab/ref-filter-no-contains' into maint

2017-09-10T08:02:56Z

A test fix. * ab/ref-filter-no-contains: tests: don't give unportable ">" to "test" built-in, use -gt