mirror of
https://github.com/git/git.git
synced 2024-05-09 06:46:16 +02:00
commit-graph: use repo_parse_commit
The write_commit_graph_context has a repository pointer, so use it. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Reviewed-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
5a3b130cad
commit
c4cc083169
|
@ -1098,7 +1098,7 @@ static int write_graph_chunk_data(struct hashfile *f,
|
||||||
uint32_t packedDate[2];
|
uint32_t packedDate[2];
|
||||||
display_progress(ctx->progress, ++ctx->progress_cnt);
|
display_progress(ctx->progress, ++ctx->progress_cnt);
|
||||||
|
|
||||||
if (parse_commit_no_graph(*list))
|
if (repo_parse_commit_no_graph(ctx->r, *list))
|
||||||
die(_("unable to parse commit %s"),
|
die(_("unable to parse commit %s"),
|
||||||
oid_to_hex(&(*list)->object.oid));
|
oid_to_hex(&(*list)->object.oid));
|
||||||
tree = get_commit_tree_oid(*list);
|
tree = get_commit_tree_oid(*list);
|
||||||
|
@ -1411,11 +1411,11 @@ static void close_reachable(struct write_commit_graph_context *ctx)
|
||||||
if (!commit)
|
if (!commit)
|
||||||
continue;
|
continue;
|
||||||
if (ctx->split) {
|
if (ctx->split) {
|
||||||
if ((!parse_commit(commit) &&
|
if ((!repo_parse_commit(ctx->r, commit) &&
|
||||||
commit_graph_position(commit) == COMMIT_NOT_FROM_GRAPH) ||
|
commit_graph_position(commit) == COMMIT_NOT_FROM_GRAPH) ||
|
||||||
flags == COMMIT_GRAPH_SPLIT_REPLACE)
|
flags == COMMIT_GRAPH_SPLIT_REPLACE)
|
||||||
add_missing_parents(ctx, commit);
|
add_missing_parents(ctx, commit);
|
||||||
} else if (!parse_commit_no_graph(commit))
|
} else if (!repo_parse_commit_no_graph(ctx->r, commit))
|
||||||
add_missing_parents(ctx, commit);
|
add_missing_parents(ctx, commit);
|
||||||
}
|
}
|
||||||
stop_progress(&ctx->progress);
|
stop_progress(&ctx->progress);
|
||||||
|
@ -1710,9 +1710,9 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE)
|
if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE)
|
||||||
parse_commit(ctx->commits.list[ctx->commits.nr]);
|
repo_parse_commit(ctx->r, ctx->commits.list[ctx->commits.nr]);
|
||||||
else
|
else
|
||||||
parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
|
repo_parse_commit_no_graph(ctx->r, ctx->commits.list[ctx->commits.nr]);
|
||||||
|
|
||||||
num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
|
num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
|
||||||
if (num_parents > 2)
|
if (num_parents > 2)
|
||||||
|
|
5
commit.h
5
commit.h
|
@ -89,9 +89,10 @@ static inline int repo_parse_commit(struct repository *r, struct commit *item)
|
||||||
return repo_parse_commit_gently(r, item, 0);
|
return repo_parse_commit_gently(r, item, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline int parse_commit_no_graph(struct commit *commit)
|
static inline int repo_parse_commit_no_graph(struct repository *r,
|
||||||
|
struct commit *commit)
|
||||||
{
|
{
|
||||||
return repo_parse_commit_internal(the_repository, commit, 0, 0);
|
return repo_parse_commit_internal(r, commit, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
|
#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
|
||||||
|
|
Loading…
Reference in New Issue