diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-08-16 12:13:16 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-16 12:13:16 -0700 |
| commit | 1f40c7c24d999675df818f9d7824937a964f9f40 (patch) | |
| tree | 7918cb1acd31a6be7b122cd4bc2e873f5b333b36 /sha1_file.c | |
| parent | Merge with master changes. (diff) | |
| parent | [PATCH] Add -k kill keyword expansion option to git-cvsimport - revised (diff) | |
| download | tgif-1f40c7c24d999675df818f9d7824937a964f9f40.tar.xz | |
Merge with master changes.
Diffstat (limited to 'sha1_file.c')
| -rw-r--r-- | sha1_file.c | 10 |
1 files changed, 8 insertions, 2 deletions
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); |