summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJameson Miller <jamill@microsoft.com>2018-07-02 19:49:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-03 17:58:15 (GMT)
commit825ed4d9a044380ac093563e6bd74311ea4488ef (patch)
treefcfb270dee1a6d626b4f2d37cbc45ee3534b4b64 /cache.h
parent768d7965068189ec5287ac53b4b55bfd443bb456 (diff)
downloadgit-825ed4d9a044380ac093563e6bd74311ea4488ef.zip
git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.gz
git-825ed4d9a044380ac093563e6bd74311ea4488ef.tar.bz2
read-cache: teach make_cache_entry to take object_id
Teach make_cache_entry function to take object_id instead of a SHA-1. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 9538511..7953d52 100644
--- a/cache.h
+++ b/cache.h
@@ -698,7 +698,12 @@ extern int remove_file_from_index(struct index_state *, const char *path);
extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
extern int add_file_to_index(struct index_state *, const char *path, int flags);
-extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, unsigned int refresh_options);
+extern struct cache_entry *make_cache_entry(unsigned int mode,
+ const struct object_id *oid,
+ const char *path,
+ int stage,
+ unsigned int refresh_options);
+
extern int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);