Skip to content

Commit 3a75f67

Browse files
author
Junio C Hamano
committed
GIT 1.0.12
2 parents ae4a352 + e921fb8 commit 3a75f67

File tree

3 files changed

+2
-19
lines changed

3 files changed

+2
-19
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ all:
5555
# Define USE_STDEV below if you want git to care about the underlying device
5656
# change being considered an inode change from the update-cache perspective.
5757

58-
GIT_VERSION = 1.0.11
58+
GIT_VERSION = 1.0.12
5959

6060
# CFLAGS and LDFLAGS are for the users to override from the command line.
6161

fetch-pack.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,9 +262,6 @@ static void filter_refs(struct ref **refs, int nr_match, char **match)
262262
{
263263
struct ref *prev, *current, *next;
264264

265-
if (!nr_match)
266-
return;
267-
268265
for (prev = NULL, current = *refs; current; current = next) {
269266
next = current->next;
270267
if ((!memcmp(current->name, "refs/", 5) &&

sha1_file.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -321,16 +321,12 @@ struct packed_git *packed_git;
321321
static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
322322
void **idx_map_)
323323
{
324-
SHA_CTX ctx;
325-
unsigned char sha1[20];
326324
void *idx_map;
327325
unsigned int *index;
328326
unsigned long idx_size;
329327
int nr, i;
330-
int fd;
328+
int fd = open(path, O_RDONLY);
331329
struct stat st;
332-
333-
fd = open(path, O_RDONLY);
334330
if (fd < 0)
335331
return -1;
336332
if (fstat(fd, &st)) {
@@ -368,16 +364,6 @@ static int check_packed_git_idx(const char *path, unsigned long *idx_size_,
368364
if (idx_size != 4*256 + nr * 24 + 20 + 20)
369365
return error("wrong index file size");
370366

371-
/*
372-
* File checksum.
373-
*/
374-
SHA1_Init(&ctx);
375-
SHA1_Update(&ctx, idx_map, idx_size-20);
376-
SHA1_Final(sha1, &ctx);
377-
378-
if (memcmp(sha1, idx_map + idx_size - 20, 20))
379-
return error("index checksum mismatch");
380-
381367
return 0;
382368
}
383369

0 commit comments

Comments
 (0)