summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-17 18:32:03 -0700
committerJunio C Hamano <junkio@cox.net>2006-09-17 18:32:03 -0700
commit4405fb77f466ddd223b999d009a705601a90b0e6 (patch)
tree01b77fb203ac5501d8bb8e0c804b803dbe937c97 /cache.h
parent2874172101600666d30ceae92d27025849509066 (diff)
parent4321134cd85eabc5d4d07a7ce00d4cf6a02c38fb (diff)
downloadgit-4405fb77f466ddd223b999d009a705601a90b0e6.tar.gz
Merge branch 'jc/pack'
* jc/pack: pack-objects: document --revs, --unpacked and --all. pack-objects --unpacked=<existing pack> option. pack-objects: further work on internal rev-list logic. pack-objects: run rev-list equivalent internally. Separate object listing routines out of rev-list
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index 8d099979d9..57db7c9b20 100644
--- a/cache.h
+++ b/cache.h
@@ -259,7 +259,7 @@ extern int write_sha1_from_fd(const unsigned char *sha1, int fd, char *buffer,
extern int write_sha1_to_fd(int fd, const unsigned char *sha1);
extern int move_temp_to_file(const char *tmpfile, const char *filename);
-extern int has_sha1_pack(const unsigned char *sha1);
+extern int has_sha1_pack(const unsigned char *sha1, const char **ignore);
extern int has_sha1_file(const unsigned char *sha1);
extern void *map_sha1_file(const unsigned char *sha1, unsigned long *);
extern int legacy_loose_object(unsigned char *);