aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-12 12:05:58 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-12 12:05:58 -0800
commit1cf716a21901e0e91db0510d18b212f34cea9e41 (patch)
treec39ab39764dd17607949dac49cb299ee1161a9d5 /merge-recursive.c
parent397dfe67c71fdd673bb108b9c6103e4a5e750edb (diff)
downloadgit-1cf716a21901e0e91db0510d18b212f34cea9e41.tar.gz
git-1cf716a21901e0e91db0510d18b212f34cea9e41.tar.xz
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>
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 523702130..b4acbb740 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1066,13 +1066,10 @@ static int merge_trees(struct tree *head,
path_list_clear(re_head, 0);
path_list_clear(entries, 1);
- } else {
- clean = 1;
- printf("merging of trees %s and %s resulted in %s\n",
- sha1_to_hex(head->object.sha1),
- sha1_to_hex(merge->object.sha1),
- sha1_to_hex((*result)->object.sha1));
}
+ else
+ clean = 1;
+
if (index_only)
*result = git_write_tree();