mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename "alternate_object_database" to "object_directory"

Browse Source 
In preparation for unifying the handling of alt odb's and the normal
repo object directory, let's use a more neutral name. This patch is
purely mechanical, swapping the type name, and converting any variables
named "alt" to "odb". There should be no functional change, but it will
reduce the noise in subsequent diffs.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2018-11-12 09:48:47 -05:00
committed by Junio C Hamano
parent b2ac148fae
commit 263db403fa
10 changed files with 69 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
commit-graph.c
View File

@ -230,7 +230,7 @@ static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
*/
static int prepare_commit_graph(struct repository *r)
{
struct alternate_object_database *alt;
struct object_directory *odb;
char *obj_dir;
int config_value;
@ -255,10 +255,10 @@ static int prepare_commit_graph(struct repository *r)
obj_dir = r->objects->objectdir;
prepare_commit_graph_one(r, obj_dir);
prepare_alt_odb(r);
for (alt = r->objects->alt_odb_list;
!r->objects->commit_graph && alt;
alt = alt->next)
prepare_commit_graph_one(r, alt->path);
for (odb = r->objects->alt_odb_list;
!r->objects->commit_graph && odb;
odb = odb->next)
prepare_commit_graph_one(r, odb->path);
return !!r->objects->commit_graph;
}