Skip to content

Commit

Permalink
builtin-log: respect diff configuration options
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Wong authored and Junio C Hamano committed Jul 7, 2006
1 parent be4c701 commit 97beb81
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions builtin-log.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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);
Expand All @@ -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);
}


Expand Down Expand Up @@ -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;
Expand All @@ -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;

/*
Expand Down

0 comments on commit 97beb81

Please sign in to comment.