Skip to content

commit: remove parse_commit_no_graph() #168

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
merged 1 commit into from
Aug 6, 2019
Merged

commit: remove parse_commit_no_graph() #168

Show file tree
Hide file tree
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
10 changes: 3 additions & 7 deletions commit-graph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,10 +466,6 @@ static int prepare_commit_graph(struct repository *r)
struct object_directory *odb;
int config_value;

if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
die("dying as requested by the '%s' variable on commit-graph load!",
GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);

if (r->objects->commit_graph_attempted)
return !!r->objects->commit_graph;
r->objects->commit_graph_attempted = 1;
Expand Down Expand Up @@ -834,7 +830,7 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
uint32_t packedDate[2];
display_progress(ctx->progress, ++ctx->progress_cnt);

parse_commit_no_graph(*list);
parse_commit(*list);
hashwrite(f, get_commit_tree_oid(*list)->hash, hash_len);

parent = (*list)->parents;
Expand Down Expand Up @@ -1052,7 +1048,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
if (!parse_commit(commit) &&
commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
add_missing_parents(ctx, commit);
} else if (!parse_commit_no_graph(commit))
} else if (!parse_commit(commit))
add_missing_parents(ctx, commit);
}
stop_progress(&ctx->progress);
Expand Down Expand Up @@ -1288,7 +1284,7 @@ static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH)
continue;

parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
parse_commit(ctx->commits.list[ctx->commits.nr]);

for (parent = ctx->commits.list[ctx->commits.nr]->parents;
parent; parent = parent->next)
Expand Down
1 change: 0 additions & 1 deletion commit-graph.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "cache.h"

#define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
#define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD"

struct commit;

Expand Down
6 changes: 0 additions & 6 deletions commit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,6 @@ static inline int repo_parse_commit(struct repository *r, struct commit *item)
{
return repo_parse_commit_gently(r, item, 0);
}

static inline int parse_commit_no_graph(struct commit *commit)
{
return repo_parse_commit_internal(the_repository, commit, 0, 0);
}

#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
#define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
Expand Down
12 changes: 3 additions & 9 deletions t/t5318-commit-graph.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,13 +385,7 @@ corrupt_graph_verify() {
test_must_fail git commit-graph verify 2>test_err &&
grep -v "^+" test_err >err &&
test_i18ngrep "$grepstr" err &&
if test "$2" != "no-copy"
then
cp $objdir/info/commit-graph commit-graph-pre-write-test
fi &&
git status --short &&
GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write &&
git commit-graph verify
git status --short
}

# usage: corrupt_graph_and_verify <position> <data> <string> [<zero_pos>]
Expand All @@ -415,9 +409,10 @@ corrupt_graph_and_verify() {
}

test_expect_success POSIXPERM,SANITY 'detect permission problem' '
test_when_finished chmod 666 $objdir/info/commit-graph &&
corrupt_graph_setup &&
chmod 000 $objdir/info/commit-graph &&
corrupt_graph_verify "Could not open" "no-copy"
corrupt_graph_verify "Could not open"
'

test_expect_success 'detect too small' '
Expand Down Expand Up @@ -536,7 +531,6 @@ test_expect_success 'git fsck (checks commit-graph)' '
git fsck &&
corrupt_graph_and_verify $GRAPH_BYTE_FOOTER "\00" \
"incorrect checksum" &&
cp commit-graph-pre-write-test $objdir/info/commit-graph &&
test_must_fail git fsck
'

Expand Down