summaryrefslogtreecommitdiff
path: root/builtin-diff-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-06-27 15:08:19 -0700
committerJunio C Hamano <junkio@cox.net>2006-06-27 15:33:40 -0700
commit3969cf7db1a13a78f3b7a36d8c1084bbe0a53459 (patch)
tree2b16523d7552997a7c3f562a4f2bffbc207a926c /builtin-diff-tree.c
parenta959e0dc16907c4dc123cfac7bd22c636064a638 (diff)
downloadgit-3969cf7db1a13a78f3b7a36d8c1084bbe0a53459.tar.gz
Fix some more diff options changes.
This fixes various problems in the new diff options code. - Fix --cc/-c --patch; it showed two-tree diff used internally. - Use "---\n" only where it matters -- that is, use it immediately after the commit log text when we show a commit log and something else before the patch text. - Do not output spurious extra "\n"; have an extra newline after the commit log text always when we have diff output and we are not doing oneline. - When running a pickaxe you need to go recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-diff-tree.c')
-rw-r--r--builtin-diff-tree.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 1e66fcac21..ae1cde9d00 100644
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -72,7 +72,6 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
init_revisions(opt);
opt->abbrev = 0;
opt->diff = 1;
- opt->diffopt.msg_sep = "---\n";
argc = setup_revisions(argc, argv, opt, NULL);
while (--argc > 0) {