summaryrefslogtreecommitdiff
path: root/builtin-log.c
diff options
context:
space:
mode:
authorTimo Hirvonen <tihirvon@gmail.com>2006-06-24 20:21:53 +0300
committerJunio C Hamano <junkio@cox.net>2006-06-26 14:58:40 -0700
commitc6744349df5089133b7662e67aba28282b6a963f (patch)
tree28d3ce776203fef4c445fa03b68fb2257eeb1799 /builtin-log.c
parent1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff)
downloadgit-c6744349df5089133b7662e67aba28282b6a963f.tar.gz
Merge with_raw, with_stat and summary variables to output_format
DIFF_FORMAT_* are now bit-flags instead of enumerated values. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-log.c')
-rw-r--r--builtin-log.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/builtin-log.c b/builtin-log.c
index 44d2d136f5..e321959c56 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -176,11 +176,9 @@ int cmd_format_patch(int argc, const char **argv, char **envp)
rev.commit_format = CMIT_FMT_EMAIL;
rev.verbose_header = 1;
rev.diff = 1;
- rev.diffopt.with_raw = 0;
- rev.diffopt.with_stat = 1;
rev.combine_merges = 0;
rev.ignore_merges = 1;
- rev.diffopt.output_format = DIFF_FORMAT_PATCH;
+ rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH;
git_config(git_format_config);
rev.extra_headers = extra_headers;