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

gitster · gitster · commit f120ae2a8e8c · 2007-10-29T12:00:55.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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)) {

Original file line number	Diff line number	Diff line change
`@@ -1586,7 +1586,7 @@ static int merge(struct commit *h1,`
`1586`	`1586`	`{`
`1587`	`1587`	`struct commit_list *iter;`
`1588`	`1588`	`struct commit *merged_common_ancestors;`
`1589`		`- struct tree *mrtree;`
	`1589`	`+ struct tree *mrtree = mrtree;`
`1590`	`1590`	`int clean;`
`1591`	`1591`
`1592`	`1592`	`if (show(4)) {`