X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=cache.h;h=ef330b4c6b71ebf5775b9fbb889ea635c7422c30;hb=7e83003029ed488253f6173b047a9c77933c8561;hp=b753b494979728b818f2c8a75af7aeab5ee73aee;hpb=6848d58c60b7af365ce54cf3e3b274a2f9da2e7e;p=~andy%2Fgit diff --git a/cache.h b/cache.h index b753b4949..ef330b4c6 100644 --- a/cache.h +++ b/cache.h @@ -522,6 +522,7 @@ extern void * read_sha1_file(const unsigned char *sha1, enum object_type *type, extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1); extern int write_sha1_file(void *buf, unsigned long len, const char *type, unsigned char *return_sha1); extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *); +extern int force_object_loose(const unsigned char *sha1, time_t mtime); extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type); @@ -783,7 +784,13 @@ extern int convert_to_git(const char *path, const char *src, size_t len, extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst); /* add */ -void add_files_to_cache(int verbose, const char *prefix, const char **pathspec); +#define ADD_FILES_VERBOSE 01 +#define ADD_FILES_IGNORE_ERRORS 02 +/* + * return 0 if success, 1 - if addition of a file failed and + * ADD_FILES_IGNORE_ERRORS was specified in flags + */ +int add_files_to_cache(const char *prefix, const char **pathspec, int flags); /* diff.c */ extern int diff_auto_refresh_index;