diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:31:24 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-05 16:31:24 -0700 |
commit | 0c926a3d9c34396636c2fea7a0cd5a4200ea298b (patch) | |
tree | 1d2c0c87f3f7fe20b20290970c04d7cc7d0a16d2 /builtin-diff-tree.c | |
parent | 169c2e9d1e81b3e7129248d89de160a7bb242411 (diff) | |
parent | 047fbe906b375e8a3a7564ad0e4443f62dd528a2 (diff) | |
download | git-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.gz git-0c926a3d9c34396636c2fea7a0cd5a4200ea298b.tar.xz |
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 'builtin-diff-tree.c')
-rw-r--r-- | builtin-diff-tree.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c index 3409a39a9..ae1cde9d0 100644 --- a/builtin-diff-tree.c +++ b/builtin-diff-tree.c @@ -84,6 +84,9 @@ int cmd_diff_tree(int argc, const char **argv, char **envp) usage(diff_tree_usage); } + if (!opt->diffopt.output_format) + opt->diffopt.output_format = DIFF_FORMAT_RAW; + /* * NOTE! We expect "a ^b" to be equal to "a..b", so we * reverse the order of the objects if the second one |