summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-25 23:23:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-25 23:23:26 (GMT)
commit5cfe4256d98af22a570c78c5e3048391a90f5f98 (patch)
tree2a168e5e4c4f52e0c58c6078304c9757f728c4e6 /cache.h
parent84da3e21dc008fe7ba18811e8b7f7614ede33079 (diff)
parent4dd1fbc7b1df0030f813a05cee19cad2c7a9cbf9 (diff)
downloadgit-5cfe4256d98af22a570c78c5e3048391a90f5f98.zip
git-5cfe4256d98af22a570c78c5e3048391a90f5f98.tar.gz
git-5cfe4256d98af22a570c78c5e3048391a90f5f98.tar.bz2
Merge branch 'jc/bigfile'
* jc/bigfile: Bigfile: teach "git add" to send a large file straight to a pack index_fd(): split into two helper functions index_fd(): turn write_object and format_check arguments into one flag
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/cache.h b/cache.h
index 28a921d..009b365 100644
--- a/cache.h
+++ b/cache.h
@@ -518,8 +518,11 @@ struct pathspec {
extern int init_pathspec(struct pathspec *, const char **);
extern void free_pathspec(struct pathspec *);
extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec);
-extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path, int format_check);
-extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
+
+#define HASH_WRITE_OBJECT 1
+#define HASH_FORMAT_CHECK 2
+extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
+extern int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned flags);
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
#define REFRESH_REALLY 0x0001 /* ignore_valid */