diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-10-15 21:30:00 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-10-15 21:30:00 (GMT) |
| commit | ed41385ad65ebf5d6341db96728be357dde3194d (patch) | |
| tree | 1c617460ba9cc18ea4611f40f3918ab19d1e968a /builtin | |
| parent | f443b226ca681d87a3a31e245a70e6bc2769123c (diff) | |
| parent | 095d112f8cce6610bb4ed112a5318d4379322b55 (diff) | |
| download | git-ed41385ad65ebf5d6341db96728be357dde3194d.zip git-ed41385ad65ebf5d6341db96728be357dde3194d.tar.gz git-ed41385ad65ebf5d6341db96728be357dde3194d.tar.bz2 | |
Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings
* ab/ignore-replace-while-working-on-commit-graph:
commit-graph: don't consider "replace" objects with "verify"
commit-graph tests: fix another graph_git_two_modes() helper
commit-graph tests: fix error-hiding graph_git_two_modes() helper
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c index 3c3de3a..fb8e166 100644 --- a/builtin/commit-graph.c +++ b/builtin/commit-graph.c @@ -263,7 +263,6 @@ static int graph_write(int argc, const char **argv) git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0)) flags |= COMMIT_GRAPH_WRITE_BLOOM_FILTERS; - read_replace_refs = 0; odb = find_odb(the_repository, opts.obj_dir); if (opts.reachable) { @@ -318,6 +317,7 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix) if (!argc) goto usage; + read_replace_refs = 0; save_commit_buffer = 0; if (!strcmp(argv[0], "verify")) |