X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=cache.h;h=7f209794ba8a6734d130a014e7c7d10dae781989;hb=b0391890d25d9e7ca8f7df2199292df68ead8093;hp=e7f5a2e16fa86111b576f9fae558cbbda2f1a050;hpb=6c5f9baa3bc0d63e141e0afc23110205379905a4;p=git.git

diff --git a/cache.h b/cache.h
index e7f5a2e1..7f209794 100644
--- a/cache.h
+++ b/cache.h
@@ -50,17 +50,21 @@
  *	Your search - "port 9418" - did not match any documents.
  *
  * as www.google.com puts it.
+ *
+ * This port has been properly assigned for git use by IANA:
+ * git (Assigned-9418) [I06-050728-0001].
+ *
+ *	git  9418/tcp   git pack transfer service
+ *	git  9418/udp   git pack transfer service
+ *
+ * with Linus Torvalds <torvalds@osdl.org> as the point of
+ * contact. September 2005.
+ *
+ * See http://www.iana.org/assignments/port-numbers
  */
 #define DEFAULT_GIT_PORT 9418
 
 /*
- * Environment variables transition.
- * We accept older names for now but warn.
- */
-extern char *gitenv_bc(const char *);
-#define gitenv(e) (getenv(e) ? : gitenv_bc(e))
-
-/*
  * Basic data structures for the directory cache
  */
 
@@ -100,7 +104,7 @@ struct cache_entry {
 	unsigned int ce_size;
 	unsigned char sha1[20];
 	unsigned short ce_flags;
-	char name[];
+	char name[0];
 };
 
 #define CE_NAMEMASK  (0x0fff)
@@ -157,6 +161,7 @@ extern int remove_cache_entry_at(int pos);
 extern int remove_file_from_cache(char *path);
 extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
 extern int ce_match_stat(struct cache_entry *ce, struct stat *st);
+extern int ce_modified(struct cache_entry *ce, struct stat *st);
 extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
 extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, const char *type);
 extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
@@ -283,7 +288,7 @@ extern int checkout_entry(struct cache_entry *ce, struct checkout *state);
 extern struct alternate_object_database {
 	struct alternate_object_database *next;
 	char *name;
-	char base[]; /* more */
+	char base[0]; /* more */
 } *alt_odb_list;
 extern void prepare_alt_odb(void);
 
@@ -296,7 +301,7 @@ extern struct packed_git {
 	unsigned int pack_last_used;
 	unsigned int pack_use_cnt;
 	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;
 
 struct pack_entry {
@@ -309,8 +314,9 @@ struct ref {
 	struct ref *next;
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
+	unsigned char force;
 	struct ref *peer_ref; /* when renaming */
-	char name[];
+	char name[0];
 };
 
 extern int git_connect(int fd[2], char *url, const char *prog);
@@ -322,7 +328,7 @@ extern int get_ack(int fd, unsigned char *result_sha1);
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match);
 
 extern struct packed_git *parse_pack_index(unsigned char *sha1);
-extern struct packed_git *parse_pack_index_file(unsigned char *sha1, 
+extern struct packed_git *parse_pack_index_file(const unsigned char *sha1,
 						char *idx_path);
 
 extern void prepare_packed_git(void);