format-patch: ignore diff.submodule setting

vangdfang · gitster · commit 339de5089115 · 2015-01-07T19:45:05.000-08:00
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 &lt;dougk.ff7@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -80,12 +80,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
 '

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ static int git_format_config(const char var, const char value, void *cb)`
`705`	`705`	`return 0;`
`706`	`706`	`}`
`707`	`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`	`709`	`return 0;`
`710`	`710`	`}`
`711`	`711`	`if (!strcmp(var, "format.numbered")) {`
Original file line number	Diff line number	Diff line change
`@@ -80,12 +80,12 @@ test_expect_success 'diff.submodule unset with extra file' '`
`80`	`80`	`run_test $THIRD second-submodule`
`81`	`81`	`'`
`82`	`82`
`83`		`-test_expect_failure 'diff.submodule=log' '`
	`83`	`+test_expect_success 'diff.submodule=log' '`
`84`	`84`	`test_config diff.submodule log &&`
`85`	`85`	`run_test $SECOND first-submodule`
`86`	`86`	`'`
`87`	`87`
`88`		`-test_expect_failure 'diff.submodule=log with extra file' '`
	`88`	`+test_expect_success 'diff.submodule=log with extra file' '`
`89`	`89`	`test_config diff.submodule log &&`
`90`	`90`	`run_test $THIRD second-submodule`
`91`	`91`	`'`