diff options
author | Daniel Barkalow <barkalow@iabervon.org> | 2005-08-16 00:10:03 -0400 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 12:09:33 -0700 |
commit | c508df5edfe12b9df7dfea4d438c1dab2812b3e9 (patch) | |
tree | 2d60fa6a1e2248728c250d4479df97a037771679 | |
parent | [PATCH] Fixed two bugs in git-cvsimport-script. (diff) | |
download | tgif-c508df5edfe12b9df7dfea4d438c1dab2812b3e9.tar.xz |
[PATCH] Add function to read an index file from an arbitrary filename.
Note that the pack file has to be in the usual location if it gets
installed later.
Signed-off-by: Daniel Barkalow <barkalow@iabervon.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r-- | cache.h | 2 | ||||
-rw-r--r-- | sha1_file.c | 10 |
2 files changed, 10 insertions, 2 deletions
@@ -319,6 +319,8 @@ extern int get_ack(int fd, unsigned char *result_sha1); extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match); extern struct packed_git *parse_pack_index(unsigned char *sha1); +extern struct packed_git *parse_pack_index_file(unsigned char *sha1, + char *idx_path); extern void prepare_packed_git(void); extern void install_packed_git(struct packed_git *pack); diff --git a/sha1_file.c b/sha1_file.c index 2d109f928b..b6ebbc5c9a 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -476,12 +476,18 @@ struct packed_git *add_packed_git(char *path, int path_len) struct packed_git *parse_pack_index(unsigned char *sha1) { + char *path = sha1_pack_index_name(sha1); + return parse_pack_index_file(sha1, path); +} + +struct packed_git *parse_pack_index_file(unsigned char *sha1, char *idx_path) +{ struct packed_git *p; unsigned long idx_size; void *idx_map; - char *path = sha1_pack_index_name(sha1); + char *path; - if (check_packed_git_idx(path, &idx_size, &idx_map)) + if (check_packed_git_idx(idx_path, &idx_size, &idx_map)) return NULL; path = sha1_pack_name(sha1); |