diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-10-21 07:34:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-21 07:34:33 -0700 |
| commit | c8516500b1ee6025466a207cd86dc30421c3b6e6 (patch) | |
| tree | c8e68de59db69a4748811504f42b4ce9d0bbcb97 /merge-recursive.c | |
| parent | 4c0c1810c98e20ce05b2f026d6f9d62cfef7aefc (diff) | |
| download | git-c8516500b1ee6025466a207cd86dc30421c3b6e6.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index bae98845ce..231e5cbd7f 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; |