diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-10-29 12:00:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-29 12:00:55 -0700 |
| commit | f120ae2a8e8cbe1bcbb2b55ebcd2e1eeb9f03ea2 (patch) | |
| tree | 32794f4321e119209879ebe14877d4b7dda17a4a /xdiff-interface.h | |
| parent | sha1_file.c: avoid gcc signed overflow warnings (diff) | |
| download | tgif-f120ae2a8e8cbe1bcbb2b55ebcd2e1eeb9f03ea2.tar.xz | |
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>
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions