From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Oct 2007 19:00:55 +0000 (-0700)
Subject: merge-recursive.c: mrtree in merge() is not used before set
X-Git-Tag: v1.5.3.5~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f120ae2a8e8cbe1bcbb2b55ebcd2e1eeb9f03ea2;p=git.git

merge-recursive.c: mrtree in merge() is not used before set

The called function merge_trees() sets its *result, to which the
address of the variable mrtree in merge() function is passed,
only when index_only is set.  But that is Ok as the function
uses the value in the variable only under index_only iteration.

However, recent gcc does not realize this.  Work it around by
adding a fake initializer.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 19d5f3b28..c2e1cb69e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1586,7 +1586,7 @@ static int merge(struct commit *h1,
 {
 	struct commit_list *iter;
 	struct commit *merged_common_ancestors;
-	struct tree *mrtree;
+	struct tree *mrtree = mrtree;
 	int clean;
 
 	if (show(4)) {