author | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Oct 2007 19:00:55 +0000 (12:00 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Oct 2007 19:00:55 +0000 (12:00 -0700) | ||
commit | f120ae2a8e8cbe1bcbb2b55ebcd2e1eeb9f03ea2 | |
tree | 32794f4321e119209879ebe14877d4b7dda17a4a | tree | snapshot |
parent | 7109c889f11b39a2c5a5122e3726be7ffce09faf | commit | diff |
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>
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>
merge-recursive.c | diff | blob | history |