diff options
Diffstat (limited to 'entry.c')
| -rw-r--r-- | entry.c | 19 |
1 files changed, 15 insertions, 4 deletions
@@ -1,9 +1,14 @@ -#include "cache.h" -#include "blob.h" -#include "object-store.h" +#include "git-compat-util.h" +#include "object-store-ll.h" #include "dir.h" +#include "environment.h" +#include "gettext.h" +#include "hex.h" +#include "name-hash.h" +#include "sparse-index.h" #include "streaming.h" #include "submodule.h" +#include "symlinks.h" #include "progress.h" #include "fsmonitor.h" #include "entry.h" @@ -86,7 +91,8 @@ void *read_blob_entry(const struct cache_entry *ce, size_t *size) { enum object_type type; unsigned long ul; - void *blob_data = read_object_file(&ce->oid, &type, &ul); + void *blob_data = repo_read_object_file(the_repository, &ce->oid, + &type, &ul); *size = ul; if (blob_data) { @@ -574,3 +580,8 @@ void unlink_entry(const struct cache_entry *ce, const char *super_prefix) return; schedule_dir_for_removal(ce->name, ce_namelen(ce)); } + +int remove_or_warn(unsigned int mode, const char *file) +{ + return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file); +} |