mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with_raw, with_stat and summary variables to output_format

Browse Source 
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>
This commit is contained in:
Timo Hirvonen
2006-06-24 20:21:53 +03:00
committed by Junio C Hamano
parent 1ef9e05dbf
commit c6744349df
6 changed files with 140 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin-diff.c
View File

@ -56,7 +56,7 @@ static int builtin_diff_files(struct rev_info *revs,
3 < revs->max_count)
usage(builtin_diff_usage);
if (revs->max_count < 0 &&
(revs->diffopt.output_format == DIFF_FORMAT_PATCH))
(revs->diffopt.output_format & DIFF_FORMAT_PATCH))
revs->combine_merges = revs->dense_combined_merges = 1;
/*
* Backward compatibility wart - "diff-files -s" used to