@matheusbsbs / matheus-bagliano / commits / 1cf716a219
Fork 0

merge-recursive: do not report the resulting tree object name

It is not available in the outermost merge, and it is only useful for debugging merge-recursive in the inner merges. Sergey Vlasov noticed that the old code accesses an uninitialized location. Signed-off-by: Junio C Hamano <junkio@cox.net>

Junio C Hamano committed Jan 12, 2007 at 12:05 UTC 1cf716a21901e0e91db0510d18b212f34cea9e41
1 file changed +3 -6
merge-recursive.c
+3 -6
@@ -1066,13 +1066,10 @@ static int merge_trees(struct tree *head,
1066 path_list_clear(re_head, 0);
1067 path_list_clear(entries, 1);
1068
1069 - } else {
1070 - clean = 1;
1071 - printf("merging of trees %s and %s resulted in %s\n",
1072 - sha1_to_hex(head->object.sha1),
1073 - sha1_to_hex(merge->object.sha1),
1074 - sha1_to_hex((*result)->object.sha1));
1069 }
1070 + else
1071 + clean = 1;
1072 +
1073 if (index_only)
1074 *result = git_write_tree();
1075