Skip to content

Commit

Permalink
GIT 1.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Junio C Hamano committed Jan 20, 2006
2 parents 8a263ae + 3a75f67 commit c4e804b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
3 changes: 0 additions & 3 deletions fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) &&
Expand Down
16 changes: 1 addition & 15 deletions sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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;
}

Expand Down

0 comments on commit c4e804b

Please sign in to comment.