aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-18 11:29:33 -0700
committerJunio C Hamano <junkio@cox.net>2006-04-18 11:29:33 -0700
commitf56ef54174598d5362d0446c5a560cb5892537c2 (patch)
tree9eb7864760a784decc4c9821f427e6d4f64cc688 /git.c
parent08ddd4f7649ccf8b9f61c903de420bfd0a8a602e (diff)
downloadgit-f56ef54174598d5362d0446c5a560cb5892537c2.tar.gz
git-f56ef54174598d5362d0446c5a560cb5892537c2.tar.xz
diff --stat: make sure to set recursive.
Just like "patch" format always needs recursive, "diffstat" format does not make sense without setting recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git.c')
-rw-r--r--git.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/git.c b/git.c
index 140ed1873..5209b04de 100644
--- a/git.c
+++ b/git.c
@@ -344,8 +344,6 @@ static int cmd_log(int argc, const char **argv, char **envp)
opt.ignore_merges = 0;
if (opt.dense_combined_merges)
opt.diffopt.output_format = DIFF_FORMAT_PATCH;
- if (opt.diffopt.output_format == DIFF_FORMAT_PATCH)
- opt.diffopt.recursive = 1;
if (!full_diff && rev.prune_data)
diff_tree_setup_paths(rev.prune_data, &opt.diffopt);
diff_setup_done(&opt.diffopt);