From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 21 Oct 2010 14:34:33 +0000 (-0700)
Subject: merge-recursive:make_room_for_directories - work around dumb compilers
X-Git-Tag: v1.7.4-rc0~101^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c8516500b1ee6025466a207cd86dc30421c3b6e6?hp=c8516500b1ee6025466a207cd86dc30421c3b6e6

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>
---