kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

sha1_file: reorder code in prepare_packed_git_one() 

The current loop does

	while (...) {
		if (it is not an .idx file)
			continue;
		process .idx file;
	}

and is reordered to

	while (...) {
		if (it is an .idx file) {
			process .idx file;
		}
	}

This makes it easier to add new extension file processing.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2013-02-13 16:13:17 +07:00 committed by Junio C Hamano
parent 0bdaa12169
commit d90906a902
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sha1_file.c
View File

@ -1024,27 +1024,25 @@ static void prepare_packed_git_one(char *objdir, int local)
int namelen = strlen(de->d_name); int namelen = strlen(de->d_name);
struct packed_git *p; struct packed_git *p;


if (!has_extension(de->d_name, ".idx"))
continue;

if (len + namelen + 1 > sizeof(path)) if (len + namelen + 1 > sizeof(path))
continue; continue;


/* Don't reopen a pack we already have. */
strcpy(path + len, de->d_name); strcpy(path + len, de->d_name);
for (p = packed_git; p; p = p->next) {
if (!memcmp(path, p->pack_name, len + namelen - 4)) if (has_extension(de->d_name, ".idx")) {
break; /* Don't reopen a pack we already have. */
for (p = packed_git; p; p = p->next) {
if (!memcmp(path, p->pack_name, len + namelen - 4))
break;
}
if (p == NULL &&
/*
* See if it really is a valid .idx file with
* corresponding .pack file that we can map.
*/
(p = add_packed_git(path, len + namelen, local)) != NULL)
install_packed_git(p);
} }
if (p)
continue;
/* See if it really is a valid .idx file with corresponding
* .pack file that we can map.
*/
p = add_packed_git(path, len + namelen, local);
if (!p)
continue;
install_packed_git(p);
} }
closedir(dir); closedir(dir);
} }