summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorCarlos Rica <jasampler@gmail.com>2007-09-11 05:17:28 +0200
committerJunio C Hamano <gitster@pobox.com>2007-09-26 13:42:10 -0700
commit102c2338da0b0954a04742f5cbe307fa6b49f225 (patch)
tree9f8ce90c6b32050761f10783a9b7bbb2aea286a0 /cache.h
parentbce92405aebf217a4738bab0df89516910818e68 (diff)
downloadgit-102c2338da0b0954a04742f5cbe307fa6b49f225.tar.gz
Move make_cache_entry() from merge-recursive.c into read-cache.c
The function make_cache_entry() is too useful to be hidden away in merge-recursive. So move it to libgit.a (exposing it via cache.h). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 70abbd59bf..fc195bc47c 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);