git, branch v2.14.0-rc0

Git 2.14-rc0

2017-07-13T23:22:29Z

Signed-off-by: Junio C Hamano

Merge branch 'jk/build-with-asan'

2017-07-13T23:14:54Z

The build procedure has been improved to allow building and testing Git with address sanitizer more easily. * jk/build-with-asan: Makefile: disable unaligned loads with UBSan Makefile: turn off -fomit-frame-pointer with sanitizers Makefile: add helper for compiling with -fsanitize test-lib: turn on ASan abort_on_error by default test-lib: set ASAN_OPTIONS variable before we run git

Merge branch 'sb/pull-rebase-submodule'

2017-07-13T23:14:54Z

"git pull --rebase --recurse-submodules" learns to rebase the branch in the submodules to an updated base. * sb/pull-rebase-submodule: builtin/fetch cleanup: always set default value for submodule recursing pull: optionally rebase submodules (remote submodule changes only) builtin/fetch: parse recurse-submodules-default at default options parsing builtin/fetch: factor submodule recurse parsing out to submodule config

Merge branch 'sb/hashmap-customize-comparison'

2017-07-13T23:14:54Z

Update the hashmap API so that data to customize the behaviour of the comparison function can be specified at the time a hashmap is initialized. * sb/hashmap-customize-comparison: hashmap: migrate documentation from Documentation/technical into header patch-ids.c: use hashmap correctly hashmap.h: compare function has access to a data field

Merge branch 'ab/grep-lose-opt-regflags'

2017-07-13T23:14:54Z

Code cleanup. * ab/grep-lose-opt-regflags: grep: remove redundant REG_NEWLINE when compiling fixed regex grep: remove regflags from the public grep_opt API grep: remove redundant and verbose re-assignments to 0 grep: remove redundant "fixed" field re-assignment to 0 grep: adjust a redundant grep pattern type assignment grep: remove redundant double assignment to 0

Sync with v2.13.3

2017-07-12T22:25:14Z

Git 2.13.3

2017-07-12T22:24:15Z

Signed-off-by: Junio C Hamano

Merge branch 'kn/ref-filter-branch-list' into maint

2017-07-12T22:23:09Z

The rewrite of "git branch --list" using for-each-ref's internals that happened in v2.13 regressed its handling of color.branch.local; this has been fixed. * kn/ref-filter-branch-list: ref-filter.c: drop return from void function branch: set remote color in ref-filter branch immediately branch: use BRANCH_COLOR_LOCAL in ref-filter format branch: only perform HEAD check for local branches

Merge branch 'ks/typofix-commit-c-comment' into maint

2017-07-12T22:20:49Z

Typofix. * ks/typofix-commit-c-comment: builtin/commit.c: fix a typo in the comment

Merge branch 'jk/reflog-walk-maint' into maint

2017-07-12T22:20:36Z

After "git branch --move" of the currently checked out branch, the code to walk the reflog of HEAD via "log -g" and friends incorrectly stopped at the reflog entry that records the renaming of the branch. * jk/reflog-walk-maint: reflog-walk: include all fields when freeing complete_reflogs reflog-walk: don't free reflogs added to cache reflog-walk: duplicate strings in complete_reflogs list reflog-walk: skip over double-null oid due to HEAD rename