projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t4011: "sleep 1" is not enough on FAT
[git.git]
/
cache.h
diff --git
a/cache.h
b/cache.h
index
c78d8ae
..
3d79c55
100644
(file)
--- a/
cache.h
+++ b/
cache.h
@@
-10,7
+10,7
@@
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
#endif
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
#endif
-#if
def DT_UNKNOWN
+#if
defined(DT_UNKNOWN) && !NO_D_TYPE_IN_DIRENT
#define DTYPE(de) ((de)->d_type)
#else
#define DT_UNKNOWN 0
#define DTYPE(de) ((de)->d_type)
#else
#define DT_UNKNOWN 0
@@
-81,7
+81,7
@@
struct cache_entry {
unsigned int ce_size;
unsigned char sha1[20];
unsigned short ce_flags;
unsigned int ce_size;
unsigned char sha1[20];
unsigned short ce_flags;
- char name[
0];
+ char name[
FLEX_ARRAY]; /* more */
};
#define CE_NAMEMASK (0x0fff)
};
#define CE_NAMEMASK (0x0fff)
@@
-159,6
+159,7
@@
extern void rollback_index_file(struct cache_file *);
extern int trust_executable_bit;
extern int only_use_symrefs;
extern int diff_rename_limit_default;
extern int trust_executable_bit;
extern int only_use_symrefs;
extern int diff_rename_limit_default;
+extern int shared_repository;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
#define GIT_REPO_VERSION 0
extern int repository_format_version;
@@
-183,6
+184,7
@@
extern const unsigned char null_sha1[20];
int git_mkstemp(char *path, size_t n, const char *template);
int git_mkstemp(char *path, size_t n, const char *template);
+int adjust_shared_perm(const char *path);
int safe_create_leading_directories(char *path);
char *safe_strncpy(char *, const char *, size_t);
char *enter_repo(char *path, int strict);
int safe_create_leading_directories(char *path);
char *safe_strncpy(char *, const char *, size_t);
char *enter_repo(char *path, int strict);
@@
-257,7
+259,7
@@
extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
extern struct alternate_object_database {
struct alternate_object_database *next;
char *name;
extern struct alternate_object_database {
struct alternate_object_database *next;
char *name;
- char base[
0
]; /* more */
+ char base[
FLEX_ARRAY
]; /* more */
} *alt_odb_list;
extern void prepare_alt_odb(void);
} *alt_odb_list;
extern void prepare_alt_odb(void);
@@
-271,7
+273,8
@@
extern struct packed_git {
unsigned int pack_use_cnt;
int pack_local;
unsigned char sha1[20];
unsigned int pack_use_cnt;
int pack_local;
unsigned char sha1[20];
- char pack_name[0]; /* something like ".git/objects/pack/xxxxx.pack" */
+ /* something like ".git/objects/pack/xxxxx.pack" */
+ char pack_name[FLEX_ARRAY]; /* more */
} *packed_git;
struct pack_entry {
} *packed_git;
struct pack_entry {
@@
-286,7
+289,7
@@
struct ref {
unsigned char new_sha1[20];
unsigned char force;
struct ref *peer_ref; /* when renaming */
unsigned char new_sha1[20];
unsigned char force;
struct ref *peer_ref; /* when renaming */
- char name[
0];
+ char name[
FLEX_ARRAY]; /* more */
};
extern int git_connect(int fd[2], char *url, const char *prog);
};
extern int git_connect(int fd[2], char *url, const char *prog);
@@
-338,4
+341,9
@@
extern char git_default_name[MAX_GITNAME];
extern char git_commit_encoding[MAX_ENCODING_LENGTH];
extern int copy_fd(int ifd, int ofd);
extern char git_commit_encoding[MAX_ENCODING_LENGTH];
extern int copy_fd(int ifd, int ofd);
+
+/* Finish off pack transfer receiving end */
+extern int receive_unpack_pack(int fd[2], const char *me, int quiet);
+extern int receive_keep_pack(int fd[2], const char *me);
+
#endif /* CACHE_H */
#endif /* CACHE_H */