[PATCH v4 2/2] format-patch: ignore diff.submodule setting
- From
Doug Kelly <dougk.ff7@gmail.com>
- Date
- Jan 7, 2015, 20:13 UTC
- Message-ID
- <1420661623-30692-2-git-send-email-dougk.ff7@gmail.com>
- In-Reply-To
- <1420661623-30692-1-git-send-email-dougk.ff7@gmail.com>
diff.submodule when set to log produces output which git-am cannot handle. Ignore this setting when generating patch output.
Signed-off-by: Doug Kelly <dougk.ff7@gmail.com> --- builtin/log.c | 2 +- t/t4255-am-submodule.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/log.c b/builtin/log.c index 734aab3..cb14db4 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -705,7 +705,7 @@ static int git_format_config(const char *var, const char *value, void *cb) return 0; } if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") || - !strcmp(var, "color.ui")) { + !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) { return 0; } if (!strcmp(var, "format.numbered")) { diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh index a38c305..27ea698 100755 --- a/t/t4255-am-submodule.sh +++ b/t/t4255-am-submodule.sh @@ -78,12 +78,12 @@ test_expect_success 'diff.submodule unset with extra file' ' run_test $THIRD second-submodule ' -test_expect_failure 'diff.submodule=log' ' +test_expect_success 'diff.submodule=log' ' test_config diff.submodule log && run_test $SECOND first-submodule ' -test_expect_failure 'diff.submodule=log with extra file' ' +test_expect_success 'diff.submodule=log with extra file' ' test_config diff.submodule log && run_test $THIRD second-submodule '
-- 2.0.5