Allow parse_pack_index on temporary files

The easiest way to verify a pack index is to open it through the
standard parse_pack_index function, permitting the header check
to happen when the file is mapped.  However, the dumb HTTP client
needs to verify a pack index before its moved into its proper file
name within the objects/pack directory, to prevent a corrupt index
from being made available.  So permit the caller to specify the
exact path of the index file.

For now we're still using the final destination name within the
sole call site in http.c, but eventually we will start to parse
the temporary path instead.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/cache.h b/cache.h
index 0eba039dbfe581d057212efe6a21702fa736a980..7db23eff26a7f42d2a92f8f7023e22bad3f4e661 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -900,7 +900,7 @@ struct extra_have_objects {
 extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);
 extern int server_supports(const char *feature);
 
-extern struct packed_git *parse_pack_index(unsigned char *sha1);
+extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
 
 extern void prepare_packed_git(void);
 extern void reprepare_packed_git(void);

diff --git a/http.c b/http.c
index 95e3b8bec87ea5caba7d0b293eb7c34184c86f7a..9c626322022c50d0c4c123e1e017a3797b28a9e8 100644 (file)
--- a/http.c
+++ b/http.c
@@ -932,7 +932,7 @@ static int fetch_and_setup_pack_index(struct packed_git **packs_head,
        if (fetch_pack_index(sha1, base_url))
                return -1;
 
-       new_pack = parse_pack_index(sha1);
+       new_pack = parse_pack_index(sha1, sha1_pack_index_name(sha1));
        if (!new_pack)
                return -1; /* parse_pack_index() already issued error message */
        new_pack->next = *packs_head;

diff --git a/sha1_file.c b/sha1_file.c
index 4e82654d7c1636f22854f50219ee97bc4027c144..9f3f514e713cf7d1e2efdbe5de093671cc6b8fdf 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -845,9 +845,8 @@ struct packed_git *add_packed_git(const char *path, int path_len, int local)
        return p;
 }
 
-struct packed_git *parse_pack_index(unsigned char *sha1)
+struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)
 {
-       const char *idx_path = sha1_pack_index_name(sha1);
        const char *path = sha1_pack_name(sha1);
        struct packed_git *p = alloc_packed_git(strlen(path) + 1);