X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=cache.h;h=16bdbb259168ff42ad68102bd012751139afa017;hb=b3abdd9d216c578383b66bb10b95edb3380640e7;hp=493983cbaef90cb845d0660dce19072b6ec0b353;hpb=88b7dd4597b11db4a99537519df91265fc7533e0;p=git.git

diff --git a/cache.h b/cache.h
index 493983cba..16bdbb259 100644
--- a/cache.h
+++ b/cache.h
@@ -264,6 +264,7 @@ extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int reall
 extern int remove_index_entry_at(struct index_state *, int pos);
 extern int remove_file_from_index(struct index_state *, const char *path);
 extern int add_file_to_index(struct index_state *, const char *path, int verbose);
+extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
 extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
 extern int ie_match_stat(struct index_state *, struct cache_entry *, struct stat *, int);
 extern int ie_modified(struct index_state *, struct cache_entry *, struct stat *, int);
@@ -491,6 +492,7 @@ struct ref {
 	unsigned char old_sha1[20];
 	unsigned char new_sha1[20];
 	unsigned char force;
+	unsigned char merge;
 	struct ref *peer_ref; /* when renaming */
 	char name[FLEX_ARRAY]; /* more */
 };