git/t, branch v2.9.2

Merge branch 'jk/tzoffset-fix' into maint

2016-07-15T16:43:42Z

Skip tests that are unrunnable on platforms without 64-bit long to avoid unnecessary test failures. * jk/tzoffset-fix: t0006: skip "far in the future" test when unsigned long is not long enough

t0006: skip "far in the future" test when unsigned long is not long enough

2016-07-15T16:05:53Z

Git's source code refers to timestamps as unsigned longs. On 32-bit platforms, as well as on Windows, unsigned long is not large enough to capture dates that are "absurdly far in the future". While we can fix this issue properly by replacing unsigned long with a larger type, we want to be a bit more conservative and just skip those tests on the maint track. Signed-off-by: Jeff King Helped-by: Johannes Schindelin Signed-off-by: Junio C Hamano

Merge branch 'jc/t2300-setup' into maint

2016-07-11T17:44:19Z

Portability fix for Windows. * jc/t2300-setup: t2300: "git --exec-path" is not usable in $PATH on Windows as-is

Merge branch 'cb/t7810-test-label-fix' into maint

2016-07-11T17:44:18Z

Test clean-up. * cb/t7810-test-label-fix: t7810: fix duplicated test title

Merge branch 'sb/t5614-modernize' into maint

2016-07-11T17:44:17Z

Test clean-up. * sb/t5614-modernize: t5614: don't use subshells

Merge branch 'js/perf-on-apple' into maint

2016-07-11T17:44:15Z

t/perf needs /usr/bin/time with GNU extension; the invocation of it is updated to "gtime" on Darwin. * js/perf-on-apple: perf: accommodate for MacOSX

Merge branch 'ak/t7800-wo-readlink' into maint

2016-07-11T17:44:15Z

One among four invocations of readlink(1) in our test suite has been rewritten so that the test can run on systems without the command (others are in valgrind test framework and t9802). * ak/t7800-wo-readlink: t7800: readlink may not be available

Merge branch 'jk/tzoffset-fix' into maint

2016-07-11T17:44:14Z

The internal code used to show local timezone offset is not prepared to handle timestamps beyond year 2100, and gave a bogus offset value to the caller. Use a more benign looking +0000 instead and let "git log" going in such a case, instead of aborting. * jk/tzoffset-fix: local_tzoffset: detect errors from tm_to_time_t t0006: test various date formats t0006: rename test-date's "show" to "relative"

Merge branch 'sb/clone-shallow-passthru' into maint

2016-07-11T17:44:12Z

Fix an unintended regression in v2.9 that breaks "clone --depth" that recurses down to submodules by forcing the submodules to also be cloned shallowly, which many server instances that host upstream of the submodules are not prepared for. * sb/clone-shallow-passthru: clone: do not let --depth imply --shallow-submodules

Merge branch 'nd/graph-width-padded' into maint

2016-07-11T17:44:09Z

"log --graph --format=" learned that "%>|(N)" specifies the width relative to the terminal's left edge, not relative to the area to draw text that is to the right of the ancestry-graph section. It also now accepts negative N that means the column limit is relative to the right border. * nd/graph-width-padded: pretty.c: support |() forms pretty: pass graph width to pretty formatting for use in '%>|(N)'