diff options
author | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-06-22 13:18:51 +0400 |
commit | e94528a0e99ea54520b8aff016275a7622c55a47 (patch) | |
tree | bd4910fd81a2c85a67b2325f72c923b12875bf06 /builtin-read-tree.c | |
parent | c0a2e1c0ba0956951b566888340e66589901b72d (diff) | |
parent | 1d7f171c3a456b980d821ee0f68e01535a5f7e36 (diff) |
Merge branch 'ff/c99'
* ff/c99:
Remove all void-pointer arithmetic.
Change types used in bitfields to be `int's.
Don't use empty structure initializers.
Cast pointers to `void *' when used in a format.
Don't instantiate structures with FAMs.
Initialize FAMs using `FLEX_ARRAY'.
Remove ranges from switch statements.
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r-- | builtin-read-tree.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c index 04506da892..9a2099d730 100644 --- a/builtin-read-tree.c +++ b/builtin-read-tree.c @@ -31,8 +31,7 @@ static int merge_size = 0; static struct object_list *trees = NULL; -static struct cache_entry df_conflict_entry = { -}; +static struct cache_entry df_conflict_entry; struct tree_entry_list { struct tree_entry_list *next; |