git, branch v2.9.0-rc0

Git 2.9-rc0

2016-05-23T22:02:48Z

Signed-off-by: Junio C Hamano

Merge branch 'svn-travis' of git://bogomips.org/git-svn

2016-05-23T22:01:03Z

* 'svn-travis' of git://bogomips.org/git-svn: travis-ci: enable Git SVN tests t91xx on Linux

Merge branch 'jc/rerere-multi'

2016-05-23T21:54:38Z

* jc/rerere-multi: rerere: remove an null statement rerere: plug memory leaks upon "rerere forget" failure

Merge branch 'da/difftool'

2016-05-23T21:54:36Z

"git difftool" learned to handle unmerged paths correctly in dir-diff mode. * da/difftool: difftool: handle unmerged files in dir-diff mode difftool: initialize variables for readability

Merge branch 'jk/test-z-n-unquoted'

2016-05-23T21:54:35Z

t9xxx series has been updated primarily for readability, while fixing small bugs in it. A few scripted Porcelains have also been updated to fix possible bugs around their use of "test -z" and "test -n". * jk/test-z-n-unquoted: always quote shell arguments to test -z/-n t9103: modernize test style t9107: switch inverted single/double quotes in test t9107: use "return 1" instead of "exit 1" t9100,t3419: enclose all test code in single-quotes t/lib-git-svn: drop $remote_git_svn and $git_svn_id

Merge branch 'ar/diff-args-osx-precompose'

2016-05-23T21:54:35Z

Many commands normalize command line arguments from NFD to NFC variant of UTF-8 on OSX, but commands in the "diff" family did not, causing "git diff $path" to complain that no such path is known to Git. They have been taught to do the normalization. * ar/diff-args-osx-precompose: diff: run arguments through precompose_argv

Merge branch 'jc/doc-lint'

2016-05-23T21:54:34Z

Find common mistakes when writing gitlink: in our documentation and drive the check from "make check-docs". I am not entirely happy with the way the script chooses what input file to validate, but it is not worse than not having anything, so let's move it forward and have the logic improved later when people care about it deeply. * jc/doc-lint: ci: validate "linkgit:" in documentation

Merge branch 'js/perf-rebase-i'

2016-05-23T21:54:33Z

Add perf test for "rebase -i" * js/perf-rebase-i: perf: run "rebase -i" under perf perf: make the tests work in worktrees perf: let's disable symlinks when they are not available

Merge branch 'jc/test-parse-options-expect'

2016-05-23T21:54:32Z

t0040 had too many unnecessary repetitions in its test data. Teach test-parse-options program so that a caller can tell what it expects in its output, so that these repetitions can be cleaned up. * jc/test-parse-options-expect: t0040: convert a few tests to use test-parse-options --expect t0040: remove unused test helpers test-parse-options: --expect= option to simplify tests test-parse-options: fix output when callback option fails

Merge branch 'pb/commit-verbose-config'

2016-05-23T21:54:32Z

"git commit" learned to pay attention to "commit.verbose" configuration variable and act as if "--verbose" option was given from the command line. * pb/commit-verbose-config: commit: add a commit.verbose config variable t7507-commit-verbose: improve test coverage by testing number of diffs parse-options.c: make OPTION_COUNTUP respect "unspecified" values t/t7507: improve test coverage t0040-parse-options: improve test coverage test-parse-options: print quiet as integer t0040-test-parse-options.sh: fix style issues