From: Eric Wong Date: Fri, 07 Jul 2006 10:10:45 GMT Subject: [PATCH] builtin-log: respect diff configuration options Message-ID: <11522670482020-git-send-email-normalperson@yhbt.net> In-Reply-To: <11522670473116-git-send-email-normalperson@yhbt.net> The log commands are all capable of generating diffs, so we should respect those configuration options for diffs here. Signed-off-by: Eric Wong --- builtin-log.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin-log.c b/builtin-log.c index 864c6cd..698b71e 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -47,6 +47,7 @@ int cmd_whatchanged(int argc, const char { struct rev_info rev; + git_config(git_diff_config); init_revisions(&rev); rev.diff = 1; rev.diffopt.recursive = 1; @@ -61,6 +62,7 @@ int cmd_show(int argc, const char **argv { struct rev_info rev; + git_config(git_diff_config); init_revisions(&rev); rev.diff = 1; rev.diffopt.recursive = 1; @@ -77,6 +79,7 @@ int cmd_log(int argc, const char **argv, { struct rev_info rev; + git_config(git_diff_config); init_revisions(&rev); rev.always_show_header = 1; cmd_log_init(argc, argv, envp, &rev); @@ -102,7 +105,7 @@ static int git_format_config(const char strcat(extra_headers, value); return 0; } - return git_default_config(var, value); + return git_diff_config(var, value); } @@ -234,6 +237,7 @@ int cmd_format_patch(int argc, const cha struct diff_options patch_id_opts; char *add_signoff = NULL; + git_config(git_format_config); init_revisions(&rev); rev.commit_format = CMIT_FMT_EMAIL; rev.verbose_header = 1; @@ -243,7 +247,6 @@ int cmd_format_patch(int argc, const cha rev.diffopt.msg_sep = ""; rev.diffopt.recursive = 1; - git_config(git_format_config); rev.extra_headers = extra_headers; /* -- 1.4.1.g3dc65