summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2006-07-07 10:10:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-07 10:25:14 (GMT)
commit97beb812dbbba750e6c9326a7f25655ebcf7bb44 (patch)
tree7441b001da7770bbcf44d5567a089d38e2777eac /builtin-log.c
parentbe4c7014f2f5945c59001297d2b0f282056f6d34 (diff)
downloadgit-97beb812dbbba750e6c9326a7f25655ebcf7bb44.zip
git-97beb812dbbba750e6c9326a7f25655ebcf7bb44.tar.gz
git-97beb812dbbba750e6c9326a7f25655ebcf7bb44.tar.bz2
builtin-log: respect diff configuration options
The log commands are all capable of generating diffs, so we should respect those configuration options for diffs here. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c7
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 **argv, char **envp)
{
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, char **envp)
{
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, char **envp)
{
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 *var, const char *value)
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 char **argv, char **envp)
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 char **argv, char **envp)
rev.diffopt.msg_sep = "";
rev.diffopt.recursive = 1;
- git_config(git_format_config);
rev.extra_headers = extra_headers;
/*