зеркало из https://github.com/microsoft/git.git
GIT 1.0.12
This commit is contained in:
Коммит
3a75f67401
2
Makefile
2
Makefile
|
@ -55,7 +55,7 @@ all:
|
|||
# Define USE_STDEV below if you want git to care about the underlying device
|
||||
# change being considered an inode change from the update-cache perspective.
|
||||
|
||||
GIT_VERSION = 1.0.11
|
||||
GIT_VERSION = 1.0.12
|
||||
|
||||
# CFLAGS and LDFLAGS are for the users to override from the command line.
|
||||
|
||||
|
|
|
@ -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) &&
|
||||
|
|
16
sha1_file.c
16
sha1_file.c
|
@ -321,16 +321,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)) {
|
||||
|
@ -368,16 +364,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;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче