format-patch: ignore diff.submodule setting
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Doug Kelly committed
Jan 7, 2015 at 14:32 UTC
339de5089115b6d8d85c73c1b8d2aa281e9625d2
2 files changed
+3
-3
builtin/log.c
+1
-1
@@ -705,7 +705,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
705
return 0;
706
}
707
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
708
- !strcmp(var, "color.ui")) {
708
+ !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) {
709
return 0;
710
}
711
if (!strcmp(var, "format.numbered")) {
t/t4255-am-submodule.sh
+2
-2
@@ -80,12 +80,12 @@ test_expect_success 'diff.submodule unset with extra file' '
80
run_test $THIRD second-submodule
81
'
82
83
-test_expect_failure 'diff.submodule=log' '
83
+test_expect_success 'diff.submodule=log' '
84
test_config diff.submodule log &&
85
run_test $SECOND first-submodule
86
'
87
88
-test_expect_failure 'diff.submodule=log with extra file' '
88
+test_expect_success 'diff.submodule=log with extra file' '
89
test_config diff.submodule log &&
90
run_test $THIRD second-submodule
91
'