git, branch v2.9.0

Git 2.9

2016-06-13T17:42:13Z

Signed-off-by: Junio C Hamano

Merge tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po

2016-06-13T01:00:57Z

l10n-2.9.0-rc0 * tag 'l10n-2.9.0-rc0' of git://github.com/git-l10n/git-po: l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: de.po: translate 104 new messages l10n: zh_CN: review for git v2.9.0 l10n round 1 l10n: zh_CN: for git v2.9.0 l10n round 1 l10n: pt_PT: update Portuguese translation l10n: pt_PT: update according to git-gui glossary l10n: pt_PT: merge git.pot file l10n: Updated Bulgarian translation of git (2597t,0f,0u) l10n: sv.po: Update Swedish translation (2597t0f0u) l10n: fr.po v2.9.0rnd1 l10n: Updated Vietnamese translation (2597t) l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed) l10n: fr.po Fixed grammar mistake

l10n: ko.po: Update Korean translation

2016-06-11T16:25:58Z

Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru

2016-06-11T12:21:52Z

* 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation

l10n: ru.po: update Russian translation

2016-06-11T09:53:43Z

Signed-off-by: Dimitriy Ryazantcev

Hopefully the final last-minute update before 2.9 final

2016-06-10T22:30:19Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/diff-compact-heuristic'

2016-06-10T22:26:06Z

It turns out that the earlier effort to update the heuristics may want to use a bit more time to mature. Turn it off by default. * jk/diff-compact-heuristic: diff: disable compaction heuristic for now

Merge branch 'jk/shell-portability'

2016-06-10T22:26:05Z

test fixes. * jk/shell-portability: t5500 & t7403: lose bash-ism "local" test-lib: add in-shell "env" replacement

Merge branch 'jc/t2300-setup'

2016-06-10T22:26:04Z

A test fix. * jc/t2300-setup: t2300: run git-sh-setup in an environment that better mimics the real life

diff: disable compaction heuristic for now

2016-06-10T20:45:23Z

http://lkml.kernel.org/g/20160610075043.GA13411@sigill.intra.peff.net reports that a change to add a new "function" with common ending with the existing one at the end of the file is shown like this: def foo do_foo_stuff() + common_ending() +end + +def bar + do_bar_stuff() + common_ending() end when the new heuristic is in use. In reality, the change is to add the blank line before "def bar" and everything below, which is what the code without the new heuristic shows. Disable the heuristics by default, and resurrect the documentation for the option and the configuration variables, while clearly marking the feature as still experimental. Signed-off-by: Junio C Hamano