aboutsummaryrefslogtreecommitdiff
path: root/builtin-read-tree.c
diff options
context:
space:
mode:
authorFlorian Forster <octo@verplant.org>2006-06-18 17:18:07 +0200
committerJunio C Hamano <junkio@cox.net>2006-06-18 21:19:10 -0700
commit571ea603a6464cab86dad2d470034e0f3b6e67df (patch)
tree887c8dc82ceb23b7ad1fe5c081418cbdc81067e7 /builtin-read-tree.c
parent04f086071e780d921f6dac83b5ffc21c3a2d7bb6 (diff)
downloadgit-571ea603a6464cab86dad2d470034e0f3b6e67df.tar.gz
git-571ea603a6464cab86dad2d470034e0f3b6e67df.tar.xz
Don't use empty structure initializers.
Empty initializers for structures are not allowed in ANSI C99. This patch removes such an initializer from `builtin-read-tree.c'. Since the struct was static (and is therefore implicitely initialized to zero anyway) it wasn't actually needed. Signed-off-by: Florian Forster <octo@verplant.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-read-tree.c')
-rw-r--r--builtin-read-tree.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 04506da89..9a2099d73 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;