DIFF_FORMAT_RAW is not default anymore
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> Signed-off-by: Junio C Hamano <junkio@cox.net>
Timo Hirvonen committed
Jun 24, 2006 at 20:25 UTC
0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e
2 files changed
+2
-6
builtin-log.c
+1
-4
@@ -24,11 +24,8 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
24
rev->verbose_header = 1;
25
argc = setup_revisions(argc, argv, rev, "HEAD");
26
if (rev->always_show_header) {
27
- if (rev->diffopt.pickaxe || rev->diffopt.filter) {
27
+ if (rev->diffopt.pickaxe || rev->diffopt.filter)
28
rev->always_show_header = 0;
29
- if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
30
- rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
31
- }
29
}
30
31
if (argc > 1)
revision.c
+1
-2
@@ -851,8 +851,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
851
}
852
if (revs->combine_merges) {
853
revs->ignore_merges = 0;
854
- if (revs->dense_combined_merges &&
855
- (revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
854
+ if (revs->dense_combined_merges && !revs->diffopt.output_format)
855
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
856
}
857
revs->diffopt.abbrev = revs->abbrev;