Fix silly thinko in "head_ref()"

diff --git a/sha1_file.c b/sha1_file.c
index 49517a414df74bb3d2a390db9bd9530f2fc518b3..74dc2aab26c0e9f87e9238686ad0a077b1570d4a 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -102,9 +102,30 @@ char *get_index_file(void)
        return git_index_file;
 }
 
-int get_sha1(const char *str, unsigned char *sha1)
+char *git_path(const char *fmt, ...)
 {
        static char pathname[PATH_MAX];
+       va_list args;
+       int len;
+
+       if (!git_dir)
+               setup_git_env();
+       len = strlen(git_dir);
+       if (len == 1 && *git_dir == '.')
+               len = 0;
+       if (len > PATH_MAX-100)
+               return "pad-path";
+       memcpy(pathname, git_dir, len);
+       if (len && git_dir[len-1] != '/')
+               pathname[len++] = '/';
+       va_start(args, fmt);
+       vsnprintf(pathname + len, sizeof(pathname) - len, fmt, args);
+       va_end(args);
+       return pathname;
+}
+
+int get_sha1(const char *str, unsigned char *sha1)
+{
        static const char *prefix[] = {
                "",
                "refs",
@@ -118,11 +139,8 @@ int get_sha1(const char *str, unsigned char *sha1)
        if (!get_sha1_hex(str, sha1))
                return 0;
 
-       if (!git_dir)
-               setup_git_env();
        for (p = prefix; *p; p++) {
-               snprintf(pathname, sizeof(pathname), "%s/%s/%s",
-                        git_dir, *p, str);
+               char * pathname = git_path("%s/%s", *p, str);
                if (!get_sha1_file(pathname, sha1))
                        return 0;
        }
@@ -294,6 +312,8 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
                return -1;
 
        index = idx_map;
+       *idx_map_ = idx_map;
+       *idx_size_ = idx_size;
 
        /* check index map */
        if (idx_size < 4*256 + 20 + 20)
@@ -316,8 +336,6 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
        if (idx_size != 4*256 + nr * 24 + 20 + 20)
                return error("wrong index file size");
 
-       *idx_map_ = idx_map;
-       *idx_size_ = idx_size;
        return 0;
 }
 
@@ -531,7 +549,7 @@ int unpack_sha1_header(z_stream *stream, void *map, unsigned long mapsize, void
        return inflate(stream, 0);
 }
 
-void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
+static void *unpack_sha1_rest(z_stream *stream, void *buffer, unsigned long size)
 {
        int bytes = strlen(buffer) + 1;
        unsigned char *buf = xmalloc(1+size);
@@ -857,7 +875,7 @@ static void *unpack_non_delta_entry(unsigned char *data,
 {
        int st;
        z_stream stream;
-       char *buffer;
+       unsigned char *buffer;
 
        buffer = xmalloc(size + 1);
        buffer[size] = 0;
@@ -949,7 +967,7 @@ int nth_packed_object_sha1(const struct packed_git *p, int n,
 int find_pack_entry_one(const unsigned char *sha1,
                        struct pack_entry *e, struct packed_git *p)
 {
-       int *level1_ofs = p->index_base;
+       unsigned int *level1_ofs = p->index_base;
        int hi = ntohl(level1_ofs[*sha1]);
        int lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
        void *index = p->index_base + 256;
@@ -1267,6 +1285,12 @@ int write_sha1_from_fd(const unsigned char *sha1, int fd)
        return 0;
 }
 
+int has_sha1_pack(const unsigned char *sha1)
+{
+       struct pack_entry e;
+       return find_pack_entry(sha1, &e);
+}
+
 int has_sha1_file(const unsigned char *sha1)
 {
        struct stat st;