packfile: allow rearrange_packed_git to handle arbitrary repositories

stefanbeller · gitster · commit c235beac4e51 · 2018-03-26T10:07:43.000-07:00
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
@@ -866,10 +866,10 @@ static int sort_pack(const void *a_, const void *b_)
 	return -1;
 }
 
-static void rearrange_packed_git(void)
+static void rearrange_packed_git(struct repository *r)
 {
-	the_repository->objects->packed_git = llist_mergesort(
-		the_repository->objects->packed_git, get_next_packed_git,
+	r->objects->packed_git = llist_mergesort(
+		r->objects->packed_git, get_next_packed_git,
 		set_next_packed_git, sort_pack);
 }
 
@@ -893,7 +893,7 @@ void prepare_packed_git(void)
 	prepare_alt_odb(the_repository);
 	for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)
 		prepare_packed_git_one(alt->path, 0);
-	rearrange_packed_git();
+	rearrange_packed_git(the_repository);
 	prepare_packed_git_mru(the_repository);
 	the_repository->objects->packed_git_initialized = 1;
 }

Original file line number	Diff line number	Diff line change
`@@ -866,10 +866,10 @@ static int sort_pack(const void a_, const void b_)`
`866`	`866`	`return -1;`
`867`	`867`	`}`
`868`	`868`
`869`		`-static void rearrange_packed_git(void)`
	`869`	`+static void rearrange_packed_git(struct repository *r)`
`870`	`870`	`{`
`871`		`- the_repository->objects->packed_git = llist_mergesort(`
`872`		`- the_repository->objects->packed_git, get_next_packed_git,`
	`871`	`+ r->objects->packed_git = llist_mergesort(`
	`872`	`+ r->objects->packed_git, get_next_packed_git,`
`873`	`873`	`set_next_packed_git, sort_pack);`
`874`	`874`	`}`
`875`	`875`
`@@ -893,7 +893,7 @@ void prepare_packed_git(void)`
`893`	`893`	`prepare_alt_odb(the_repository);`
`894`	`894`	`for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next)`
`895`	`895`	`prepare_packed_git_one(alt->path, 0);`
`896`		`- rearrange_packed_git();`
	`896`	`+ rearrange_packed_git(the_repository);`
`897`	`897`	`prepare_packed_git_mru(the_repository);`
`898`	`898`	`the_repository->objects->packed_git_initialized = 1;`
`899`	`899`	`}`