git/contrib, branch v2.5.0

Merge branch 'cb/subtree-tests-update'

2015-07-10T21:17:56Z

Tests update in contrib/subtree. * cb/subtree-tests-update: contrib/subtree: small tidy-up to test contrib/subtree: fix broken &&-chains and revealed test error contrib/subtree: use tabs consitently for indentation in tests

git-multimail: update to release 1.1.1

2015-07-06T16:43:17Z

The only change is a bugfix: the SMTP mailer was not working with Python 2.4. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'jc/prompt-document-ps1-state-separator'

2015-07-01T21:02:32Z

Docfix. * jc/prompt-document-ps1-state-separator: git-prompt.sh: document GIT_PS1_STATESEPARATOR

Merge branch 'pa/auto-gc-mac-osx'

2015-06-24T19:21:58Z

Recent Mac OS X updates breaks the logic to detect that the machine is on the AC power in the sample pre-auto-gc script. * pa/auto-gc-mac-osx: hooks/pre-auto-gc: adjust power checking for newer OS X

Merge branch 'af/tcsh-completion-noclobber'

2015-06-24T19:21:53Z

The tcsh completion writes a bash scriptlet but that would have failed for users with noclobber set. * af/tcsh-completion-noclobber: git-completion.tcsh: fix redirect with noclobber

Merge branch 'sg/completion-commit-cleanup'

2015-06-24T19:21:51Z

* sg/completion-commit-cleanup: completion: teach 'scissors' mode to 'git commit --cleanup='

contrib/subtree: small tidy-up to test

2015-06-22T22:30:00Z

There's no need to switch branches to parse another branch's ancestry. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

contrib/subtree: fix broken &&-chains and revealed test error

2015-06-22T22:29:51Z

This fixes two instances where a &&-chain was broken in the subtree tests and fixes a test error that was revealed because of this. Many tests in t7900-subtree.sh make a commit and then use 'undo' to reset the state for the next test. In the 'check hash of split' test, an 'undo' was being invoked after a 'subtree split' even though the particular invocation of 'subtree split' did not actually make a commit. The subsequent check_equal was failing, but this failure was masked by that broken &&-chain. Removing this undo causes the failing check_equal to succeed but breaks the a check_equal later on in the same test. It turns out that an earlier test ('check if --message for merge works with squash too') makes a commit but doesn't 'undo' to the state expected by the remaining tests. None of the intervening tests cared enough about the state of the test repo to fail and the spurious 'undo' in 'check hash of split' restored the expected state for any remaining test that might care. Adding the missing 'undo' to 'check if --message for merge works with squash too' and removing the spurious one from 'check hash of split' fixes all tests once the &&-chains are completed. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

contrib/subtree: use tabs consitently for indentation in tests

2015-06-22T22:29:36Z

Although subtrees tests uses more spaces for indentation than tabs, there are still quite a lot of lines indented with tabs. As tabs conform with Git coding guidelines resolve the inconsistency in favour of tabs. Signed-off-by: Charles Bailey Signed-off-by: Junio C Hamano

git-multimail: update to release 1.1.0

2015-06-18T17:03:52Z

The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Richard Hansen Contributions-by: Michael Haggerty Contributions-by: Elijah Newren Contributions-by: Luke Mewburn Contributions-by: Dave Boutcher Contributions-by: Azat Khuzhin Contributions-by: Sebastian Schuberth Contributions-by: Mikko Johannes Koivunalho Contributions-by: Elijah Newren Contributions-by: Benoît Ryder Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano