Changes since the previous iteration: * Add missing option --ancestry-path to setup_revisions() * Drop unnecessary caching of submodule refs * Use buf.len instead of NUL-padding for path buffer in git_path_submodule() * Extend the testcases so they will check for the correct suggestion output in case of a failed merge. * cleanup of some comments Heiko Voigt (4): add missing && to submodule-merge testcase teach ref iteration module about submodules extent setup_revisions() so it works with submodules implement automatic fast forward merge for submodules cache.h | 3 + merge-recursive.c | 9 ++- path.c | 38 +++++++++++ refs.c | 149 ++++++++++++++++++++++++++++++++--------- refs.h | 8 ++ revision.c | 32 +++++---- revision.h | 1 + submodule.c | 158 ++++++++++++++++++++++++++++++++++++++++++++ submodule.h | 2 + t/t7405-submodule-merge.sh | 129 ++++++++++++++++++++++++++++++++++-- 10 files changed, 473 insertions(+), 56 deletions(-) -- 1.7.2.rc1.217.g7dc0db.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html