undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DIFF_FORMAT_RAW is not default anymore

Browse Source 
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>
This commit is contained in:
Timo Hirvonen 2006-06-24 20:25:08 +03:00 committed by Junio C Hamano
parent c9b5ef998a
commit 0e677e1a6b
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
builtin-log.c
View File

@ -24,11 +24,8 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
rev->verbose_header = 1; rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD"); argc = setup_revisions(argc, argv, rev, "HEAD");
if (rev->always_show_header) { if (rev->always_show_header) {
if (rev->diffopt.pickaxe || rev->diffopt.filter) { if (rev->diffopt.pickaxe || rev->diffopt.filter)
rev->always_show_header = 0; rev->always_show_header = 0;
if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
}
} }
if (argc > 1) if (argc > 1)

3
revision.c
View File

@ -851,8 +851,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
} }
if (revs->combine_merges) { if (revs->combine_merges) {
revs->ignore_merges = 0; revs->ignore_merges = 0;
if (revs->dense_combined_merges && if (revs->dense_combined_merges && !revs->diffopt.output_format)
(revs->diffopt.output_format != DIFF_FORMAT_DIFFSTAT))
revs->diffopt.output_format = DIFF_FORMAT_PATCH; revs->diffopt.output_format = DIFF_FORMAT_PATCH;
} }
revs->diffopt.abbrev = revs->abbrev; revs->diffopt.abbrev = revs->abbrev;