[PATCH 5/7] DIFF_FORMAT_RAW is not default anymore
- From
- Timo Hirvonen <tihirvon@gmail.com>
- Date
- Jun 24, 2006, 17:25 UTC
- Message-ID
- <20060624202508.b997e4e5.tihirvon@gmail.com>
- In-Reply-To
- <20060624201843.a5b4f7b9.tihirvon@gmail.com>
diff_setup() used to initialize output_format to DIFF_FORMAT_RAW. Now the default is 0 (no output) so don't compare against DIFF_FORMAT_RAW to see if any diff format command line flags were given.
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> --- builtin-log.c | 5 +---- revision.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/builtin-log.c b/builtin-log.c index 65f9527..f173070 100644 --- a/builtin-log.c +++ b/builtin-log.c @@ -24,11 +24,8 @@ static int cmd_log_wc(int argc, const ch rev->verbose_header = 1; argc = setup_revisions(argc, argv, rev, "HEAD"); if (rev->always_show_header) { - if (rev->diffopt.pickaxe || rev->diffopt.filter) { + if (rev->diffopt.pickaxe || rev->diffopt.filter) rev->always_show_header = 0; - if (rev->diffopt.output_format == DIFF_FORMAT_RAW) - rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT; - } } if (argc > 1) diff --git a/revision.c b/revision.c index b963f2a..ae4ca82 100644 --- a/revision.c +++ b/revision.c @@ -851,8 +851,7 @@ int setup_revisions(int argc, const char } if (revs->combine_merges) { revs->ignore_merges = 0; - if (revs->dense_combined_merges && - (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT)) + if (revs->dense_combined_merges && !revs->diffopt.output_format) revs->diffopt.output_format = DIFF_FORMAT_PATCH; } revs->diffopt.abbrev = revs->abbrev;
-- 1.4.1.rc1.g8637