X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff-tree.c;h=d1265d796388dd1c1a56c00f793893ee9dc6ed10;hb=459a21bd35675e140e19569e8b5c62c7fc4eee5b;hp=b170b03fd34da719b322b49d9718262a625df357;hpb=0a798076b8d1a4a31bf2b24c564e2a99fd1c43a1;p=git.git

diff --git a/diff-tree.c b/diff-tree.c
index b170b03f..d1265d79 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -6,7 +6,7 @@ static int show_root_diff = 0;
 static int no_commit_id = 0;
 static int verbose_header = 0;
 static int ignore_merges = 1;
-static int combine_merges = 1;
+static int combine_merges = 0;
 static int dense_combined_merges = 0;
 static int read_stdin = 0;
 static int always_show_header = 0;
@@ -52,7 +52,7 @@ static int diff_root_tree(const unsigned char *new, const char *base)
 	void *tree;
 	struct tree_desc empty, real;
 
-	tree = read_object_with_reference(new, "tree", &real.size, NULL);
+	tree = read_object_with_reference(new, tree_type, &real.size, NULL);
 	if (!tree)
 		die("unable to read root tree (%s)", sha1_to_hex(new));
 	real.buf = tree;
@@ -248,7 +248,7 @@ int main(int argc, const char **argv)
 			continue;
 		}
 		if (!strcmp(arg, "-m")) {
-			combine_merges = ignore_merges = 0;
+			ignore_merges = 0;
 			continue;
 		}
 		if (!strcmp(arg, "-c")) {