git, branch v2.12.0-rc0

Git 2.12-rc0

2017-02-03T19:29:52Z

Signed-off-by: Junio C Hamano

Merge branch 'cw/log-updates-for-all-refs-really'

2017-02-03T19:25:19Z

The "core.logAllRefUpdates" that used to be boolean has been enhanced to take 'always' as well, to record ref updates to refs other than the ones that are expected to be updated (i.e. branches, remote-tracking branches and notes). * cw/log-updates-for-all-refs-really: doc: add note about ignoring '--no-create-reflog' update-ref: add test cases for bare repository refs: add option core.logAllRefUpdates = always config: add markup to core.logAllRefUpdates doc

Merge branch 'pl/complete-diff-submodule-diff'

2017-02-03T19:25:19Z

The command line completion (in contrib/) learned that "git diff --submodule=" can take "diff" as a recently added option. * pl/complete-diff-submodule-diff: Completion: Add support for --submodule=diff

Merge branch 'rs/object-id'

2017-02-03T19:25:19Z

"uchar [40]" to "struct object_id" conversion continues. * rs/object-id: checkout: convert post_checkout_hook() to struct object_id use oidcpy() for copying hashes between instances of struct object_id use oid_to_hex_r() for converting struct object_id hashes to hex strings

Merge branch 'js/re-running-failed-tests'

2017-02-03T19:25:19Z

"make -C t failed" will now run only the tests that failed in the previous run. This is usable only when prove is not use, and gives a useless error message when run after "make clean", but otherwise is serviceable. * js/re-running-failed-tests: t/Makefile: add a rule to re-run previously-failed tests

Merge branch 'sb/submodule-update-initial-runs-custom-script'

2017-02-03T19:25:19Z

The user can specify a custom update method that is run when "submodule update" updates an already checked out submodule. This was ignored when checking the submodule out for the first time and we instead always just checked out the commit that is bound to the path in the superproject's index. * sb/submodule-update-initial-runs-custom-script: submodule update: run custom update script for initial populating as well

Merge branch 'sb/submodule-recursive-absorb'

2017-02-03T19:25:18Z

When a submodule "A", which has another submodule "B" nested within it, is "absorbed" into the top-level superproject, the inner submodule "B" used to be left in a strange state. The logic to adjust the .git pointers in these submodules has been corrected. * sb/submodule-recursive-absorb: submodule absorbing: fix worktree/gitdir pointers recursively for non-moves cache.h: expose the dying procedure for reading gitlinks setup: add gentle version of resolve_git_dir

Merge branch 'sb/unpack-trees-super-prefix'

2017-02-03T19:25:18Z

"git read-tree" and its underlying unpack_trees() machinery learned to report problematic paths prefixed with the --super-prefix option. * sb/unpack-trees-super-prefix: unpack-trees: support super-prefix option t1001: modernize style t1000: modernize style read-tree: use OPT_BOOL instead of OPT_SET_INT

Sync with v2.11.1

2017-02-02T21:43:19Z

* maint: Git 2.11.1

Ninth batch for 2.12; almost ready for -rc0

2017-02-02T21:43:10Z

Signed-off-by: Junio C Hamano