diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-01-19 19:57:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-19 19:57:56 -0800 |
| commit | 949964c4af740015c53cb7630fea8795e0f710a0 (patch) | |
| tree | 23b12b461044ba8d4f10d8dd6a6f53f8b9bc237f | |
| parent | Allow building of RPM from interim snapshot. (diff) | |
| parent | GIT 1.1.4 (diff) | |
| download | tgif-949964c4af740015c53cb7630fea8795e0f710a0.tar.xz | |
Merge fixes up to GIT 1.1.4
| -rw-r--r-- | fetch-pack.c | 3 | ||||
| -rw-r--r-- | sha1_file.c | 16 |
2 files changed, 1 insertions, 18 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index d34f322477..27f5d2a5ff 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -262,9 +262,6 @@ static void filter_refs(struct ref **refs, int nr_match, char **match) { struct ref *prev, *current, *next; - if (!nr_match) - return; - for (prev = NULL, current = *refs; current; current = next) { next = current->next; if ((!memcmp(current->name, "refs/", 5) && diff --git a/sha1_file.c b/sha1_file.c index 8bebbb255f..20f6419bde 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -349,16 +349,12 @@ struct packed_git *packed_git; static int check_packed_git_idx(const char *path, unsigned long *idx_size_, void **idx_map_) { - SHA_CTX ctx; - unsigned char sha1[20]; void *idx_map; unsigned int *index; unsigned long idx_size; int nr, i; - int fd; + int fd = open(path, O_RDONLY); struct stat st; - - fd = open(path, O_RDONLY); if (fd < 0) return -1; if (fstat(fd, &st)) { @@ -396,16 +392,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"); - /* - * File checksum. - */ - SHA1_Init(&ctx); - SHA1_Update(&ctx, idx_map, idx_size-20); - SHA1_Final(sha1, &ctx); - - if (memcmp(sha1, idx_map + idx_size - 20, 20)) - return error("index checksum mismatch"); - return 0; } |