git, branch v2.10.2

Git 2.10.2

2016-10-28T16:02:44Z

Signed-off-by: Junio C Hamano

Merge branch 'pb/test-parse-options-expect' into maint

2016-10-28T16:01:24Z

Test clean-up. * pb/test-parse-options-expect: t0040: convert all possible tests to use `test-parse-options --expect`

Merge branch 'jc/cocci-xstrdup-or-null' into maint

2016-10-28T16:01:23Z

Code cleanup. * jc/cocci-xstrdup-or-null: cocci: refactor common patterns to use xstrdup_or_null()

Merge branch 'rs/cocci' into maint

2016-10-28T16:01:23Z

Code cleanup. * rs/cocci: use strbuf_add_unique_abbrev() for adding short hashes, part 3 remove unnecessary NULL check before free(3) coccicheck: make transformation for strbuf_addf(sb, "...") more precise use strbuf_add_unique_abbrev() for adding short hashes, part 2 use strbuf_addstr() instead of strbuf_addf() with "%s", part 2 gitignore: ignore output files of coccicheck make target use strbuf_addstr() for adding constant strings to a strbuf, part 2 add coccicheck make target contrib/coccinelle: fix semantic patch for oid_to_hex_r()

Merge branch 'jc/diff-unique-abbrev-comments' into maint

2016-10-28T16:01:23Z

A bit more comments in a tricky code. * jc/diff-unique-abbrev-comments: diff_unique_abbrev(): document its assumption and limitation

Merge branch 'rs/pretty-format-color-doc-fix' into maint

2016-10-28T16:01:23Z

Small doc update. * rs/pretty-format-color-doc-fix: pretty: fix document link for color specification

Merge branch 'js/reset-usage' into maint

2016-10-28T16:01:22Z

Message fix-up. * js/reset-usage: reset: fix usage

Merge branch 'po/fix-doc-merge-base-illustration' into maint

2016-10-28T16:01:21Z

Some AsciiDoc formatter mishandles a displayed illustration with tabs in it. Adjust a few of them in merge-base documentation to work around them. * po/fix-doc-merge-base-illustration: doc: fix the 'revert a faulty merge' ASCII art tab spacing doc: fix merge-base ASCII art tab spacing

Merge branch 'jk/tap-verbose-fix' into maint

2016-10-28T16:01:21Z

The Travis CI configuration we ship ran the tests with --verbose option but this risks non-TAP output that happens to be "ok" to be misinterpreted as TAP signalling a test that passed. This resulted in unnecessary failure. This has been corrected by introducing a new mode to run our tests in the test harness to send the verbose output separately to the log file. * jk/tap-verbose-fix: test-lib: bail out when "-v" used under "prove" travis: use --verbose-log test option test-lib: add --verbose-log option test-lib: handle TEST_OUTPUT_DIRECTORY with spaces

Merge branch 'tg/add-chmod+x-fix' into maint

2016-10-28T16:01:19Z

A hot-fix for a test added by a recent topic that went to both 'master' and 'maint' already. * tg/add-chmod+x-fix: t3700: fix broken test under !SANITY