packfile: allow prepare_packed_git_mru to handle arbitrary repositories

stefanbeller · gitster · commit 804be7969028 · 2018-03-26T10:07:43.000-07:00
This conversion was done without the #define trick used in the earlier
series refactoring to have better repository access, because this function
is easy to review, as all lines are converted and it has only one caller

Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/packfile.c b/packfile.c
@@ -873,14 +873,14 @@ static void rearrange_packed_git(void)
 		set_next_packed_git, sort_pack);
 }
 
-static void prepare_packed_git_mru(void)
+static void prepare_packed_git_mru(struct repository *r)
 {
 	struct packed_git *p;
 
-	INIT_LIST_HEAD(&the_repository->objects->packed_git_mru);
+	INIT_LIST_HEAD(&r->objects->packed_git_mru);
 
-	for (p = the_repository->objects->packed_git; p; p = p->next)
-		list_add_tail(&p->mru, &the_repository->objects->packed_git_mru);
+	for (p = r->objects->packed_git; p; p = p->next)
+		list_add_tail(&p->mru, &r->objects->packed_git_mru);
 }
 
 void prepare_packed_git(void)
@@ -894,7 +894,7 @@ void prepare_packed_git(void)
 	for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)
 		prepare_packed_git_one(alt->path, 0);
 	rearrange_packed_git();
-	prepare_packed_git_mru();
+	prepare_packed_git_mru(the_repository);
 	the_repository->objects->packed_git_initialized = 1;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -873,14 +873,14 @@ static void rearrange_packed_git(void)`
`873`	`873`	`set_next_packed_git, sort_pack);`
`874`	`874`	`}`
`875`	`875`
`876`		`-static void prepare_packed_git_mru(void)`
	`876`	`+static void prepare_packed_git_mru(struct repository *r)`
`877`	`877`	`{`
`878`	`878`	`struct packed_git *p;`
`879`	`879`
`880`		`- INIT_LIST_HEAD(&the_repository->objects->packed_git_mru);`
	`880`	`+ INIT_LIST_HEAD(&r->objects->packed_git_mru);`
`881`	`881`
`882`		`- for (p = the_repository->objects->packed_git; p; p = p->next)`
`883`		`- list_add_tail(&p->mru, &the_repository->objects->packed_git_mru);`
	`882`	`+ for (p = r->objects->packed_git; p; p = p->next)`
	`883`	`+ list_add_tail(&p->mru, &r->objects->packed_git_mru);`
`884`	`884`	`}`
`885`	`885`
`886`	`886`	`void prepare_packed_git(void)`
`@@ -894,7 +894,7 @@ void prepare_packed_git(void)`
`894`	`894`	`for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)`
`895`	`895`	`prepare_packed_git_one(alt->path, 0);`
`896`	`896`	`rearrange_packed_git();`
`897`		`- prepare_packed_git_mru();`
	`897`	`+ prepare_packed_git_mru(the_repository);`
`898`	`898`	`the_repository->objects->packed_git_initialized = 1;`
`899`	`899`	`}`
`900`	`900`