summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-05 16:31:24 -0700
committerJunio C Hamano <junkio@cox.net>2006-07-05 16:31:24 -0700
commit0c926a3d9c34396636c2fea7a0cd5a4200ea298b (patch)
tree1d2c0c87f3f7fe20b20290970c04d7cc7d0a16d2 /revision.c
parent169c2e9d1e81b3e7129248d89de160a7bb242411 (diff)
parent047fbe906b375e8a3a7564ad0e4443f62dd528a2 (diff)
downloadgit-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.gz
Merge branch 'th/diff'
* th/diff: builtin-diff: turn recursive on when defaulting to --patch format. t4013: note improvements brought by the new output code. t4013: add format-patch tests. format-patch: fix diff format option implementation combine-diff.c: type sanity. t4013 test updates for new output code. Fix some more diff options changes. Fix diff-tree -s log --raw: Don't descend into subdirectories by default diff-tree: Use ---\n as a message separator Print empty line between raw, stat, summary and patch t4013: add more tests around -c and --cc whatchanged: Default to DIFF_FORMAT_RAW Don't xcalloc() struct diffstat_t Add msg_sep to diff_options DIFF_FORMAT_RAW is not default anymore Set default diff output format after parsing command line Make --raw option available for all diff commands Merge with_raw, with_stat and summary variables to output_format t4013: add tests for diff/log family output options.
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/revision.c b/revision.c
index 880fb7bb30..ab89c22417 100644
--- a/revision.c
+++ b/revision.c
@@ -852,8 +852,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
}
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;