aboutsummaryrefslogtreecommitdiff
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-12 13:25:07 -0700
commit6640f88165f77edcc266a2c0c56fb017dc613198 (patch)
treefddb5be0b16a20d994edb333f6fab0f856e5dd51 /cache.h
parent359048d6ec296757266887a8ced5a927b97b94c1 (diff)
downloadgit-6640f88165f77edcc266a2c0c56fb017dc613198.tar.gz
git-6640f88165f77edcc266a2c0c56fb017dc613198.tar.xz
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 493983cba..824650016 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);