summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorDoug Kelly <dougk.ff7@gmail.com>2015-01-07 20:32:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-01-08 03:45:05 (GMT)
commit339de5089115b6d8d85c73c1b8d2aa281e9625d2 (patch)
tree2e28ebb41960d3f68b803c927098872a7fa63934 /builtin/log.c
parentfe7611c46f34cc4164a719a94e88e13ca5c978b1 (diff)
downloadgit-339de5089115b6d8d85c73c1b8d2aa281e9625d2.zip
git-339de5089115b6d8d85c73c1b8d2aa281e9625d2.tar.gz
git-339de5089115b6d8d85c73c1b8d2aa281e9625d2.tar.bz2
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>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 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")) {