A colleague found an issue that when using diff.submodule=log in his .gitconfig, format-patch would use the log format for submodule changes, which would be ignored or error out when processed by git-am. format-patch now ignores the diff.submodule option and a testcase for this specific issue now exists.
Since this seems like a bug in current versions, I have based and tested this on the "maint" branch, but there's no reason it shouldn't apply cleanly to master as well. Apologies for any rawness to the first round of this change. "Long time listener; first time caller." Any feedback is appreciated. Doug Kelly (2): t4255: test am submodule with diff.submodule format-patch: ignore diff.submodule setting builtin/log.c | 2 +- t/t4255-am-submodule.sh | 83 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 1 deletion(-) -- 2.0.5 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
