Skip to content

commit-graph: writing missing parents is a BUG #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
derrickstolee merged 1 commit into from
Dec 19, 2018
Merged

commit-graph: writing missing parents is a BUG #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions commit-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
#define GRAPH_OID_LEN GRAPH_OID_LEN_SHA1

#define GRAPH_OCTOPUS_EDGES_NEEDED 0x80000000
#define GRAPH_PARENT_MISSING 0x7fffffff
#define GRAPH_EDGE_LAST_MASK 0x7fffffff
#define GRAPH_PARENT_NONE 0x70000000

Expand Down Expand Up @@ -496,7 +495,9 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
commit_to_sha1);

if (edge_value < 0)
edge_value = GRAPH_PARENT_MISSING;
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
oid_to_hex(&(*list)->object.oid));
}

hashwrite_be32(f, edge_value);
Expand All @@ -514,7 +515,9 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
nr_commits,
commit_to_sha1);
if (edge_value < 0)
edge_value = GRAPH_PARENT_MISSING;
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
oid_to_hex(&(*list)->object.oid));
}

hashwrite_be32(f, edge_value);
Expand Down Expand Up @@ -567,7 +570,9 @@ static void write_graph_chunk_large_edges(struct hashfile *f,
commit_to_sha1);

if (edge_value < 0)
edge_value = GRAPH_PARENT_MISSING;
BUG("missing parent %s for commit %s",
oid_to_hex(&parent->item->object.oid),
oid_to_hex(&(*list)->object.oid));
else if (!parent->next)
edge_value |= GRAPH_LAST_EDGE;

Expand Down Expand Up @@ -864,7 +869,7 @@ void write_commit_graph(const char *obj_dir,
count_distinct++;
}

if (count_distinct >= GRAPH_PARENT_MISSING)
if (count_distinct >= GRAPH_EDGE_LAST_MASK)
die(_("the commit graph format cannot write %d commits"), count_distinct);

commits.nr = 0;
Expand All @@ -891,7 +896,7 @@ void write_commit_graph(const char *obj_dir,
}
num_chunks = num_extra_edges ? 4 : 3;

if (commits.nr >= GRAPH_PARENT_MISSING)
if (commits.nr >= GRAPH_EDGE_LAST_MASK)
die(_("too many commits to write graph"));

compute_generation_numbers(&commits, report_progress);
Expand Down