@matheusbsbs / matheus-bagliano / commits / c8516500b1
Fork 0

merge-recursive:make_room_for_directories - work around dumb compilers

Some vintage of gcc does not seem to notice last_len is only used when last_file is already set to non-NULL at which point last_len is also set. Noticed on FreeBSD 8 Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Oct 21, 2010 at 07:34 UTC c8516500b1ee6025466a207cd86dc30421c3b6e6
1 file changed +1 -1
merge-recursive.c
+1 -1
@@ -365,7 +365,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o,
365 * below the corresponding directory.
366 */
367 const char *last_file = NULL;
368 - int last_len;
368 + int last_len = 0;
369 struct stage_data *last_e;
370 int i;
371