mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-06 23:51:24 +02:00
Code

Merge refs/heads/master from .

Browse Source
This commit is contained in:
Junio C Hamano 2005-08-29 13:07:55 -07:00
commit 5dd02f9404
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cache.h
View File

@ -104,7 +104,7 @@ struct cache_entry {
unsigned int ce_size; unsigned int ce_size;
unsigned char sha1[20]; unsigned char sha1[20];
unsigned short ce_flags; unsigned short ce_flags;
char name[]; char name[0];
}; };
#define CE_NAMEMASK (0x0fff) #define CE_NAMEMASK (0x0fff)
@ -287,7 +287,7 @@ extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
extern struct alternate_object_database { extern struct alternate_object_database {
struct alternate_object_database *next; struct alternate_object_database *next;
char *name; char *name;
char base[]; /* more */ char base[0]; /* more */
} *alt_odb_list; } *alt_odb_list;
extern void prepare_alt_odb(void); extern void prepare_alt_odb(void);
@ -300,7 +300,7 @@ extern struct packed_git {
unsigned int pack_last_used; unsigned int pack_last_used;
unsigned int pack_use_cnt; unsigned int pack_use_cnt;
unsigned char sha1[20]; unsigned char sha1[20];
char pack_name[]; /* something like ".git/objects/pack/xxxxx.pack" */ char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
} *packed_git; } *packed_git;
struct pack_entry { struct pack_entry {
@ -315,7 +315,7 @@ struct ref {
unsigned char new_sha1[20]; unsigned char new_sha1[20];
unsigned char force; unsigned char force;
struct ref *peer_ref; /* when renaming */ struct ref *peer_ref; /* when renaming */
char name[]; char name[0];
}; };
extern int git_connect(int fd[2], char *url, const char *prog); extern int git_connect(int fd[2], char *url, const char *prog);

2
commit.c
View File

@ -102,7 +102,7 @@ static unsigned long parse_commit_date(const char *buf)
static struct commit_graft { static struct commit_graft {
unsigned char sha1[20]; unsigned char sha1[20];
int nr_parent; int nr_parent;
unsigned char parent[][20]; /* more */ unsigned char parent[0][20]; /* more */
} **commit_graft; } **commit_graft;
static int commit_graft_alloc, commit_graft_nr; static int commit_graft_alloc, commit_graft_nr;

2
ls-files.c
View File

@ -205,7 +205,7 @@ static int excluded(const char *pathname)
struct nond_on_fs { struct nond_on_fs {
int len; int len;
char name[]; char name[0];
}; };
static struct nond_on_fs **dir; static struct nond_on_fs **dir;

2
receive-pack.c
View File

@ -24,7 +24,7 @@ struct command {
unsigned char updated; unsigned char updated;
unsigned char old_sha1[20]; unsigned char old_sha1[20];
unsigned char new_sha1[20]; unsigned char new_sha1[20];
char ref_name[]; char ref_name[0];
}; };
static struct command *commands = NULL; static struct command *commands = NULL;

2
server-info.c
View File

@ -70,7 +70,7 @@ static struct pack_info {
int nr_alloc; int nr_alloc;
int nr_heads; int nr_heads;
unsigned char (*head)[20]; unsigned char (*head)[20];
char dep[]; /* more */ char dep[0]; /* more */
} **info; } **info;
static int num_pack; static int num_pack;
static const char *objdir; static const char *objdir;