From c8516500b1ee6025466a207cd86dc30421c3b6e6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 21 Oct 2010 07:34:33 -0700 Subject: [PATCH] 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 --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/merge-recursive.c b/merge-recursive.c index bae98845c..231e5cbd7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -365,7 +365,7 @@ static void make_room_for_directories_of_df_conflicts(struct merge_options *o, * below the corresponding directory. */ const char *last_file = NULL; - int last_len; + int last_len = 0; struct stage_data *last_e; int i; -- 2.26.2