aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/commit-graph.c
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2021-11-04 08:34:15 +0800
committerJiang Xin <worldhello.net@gmail.com>2021-11-04 08:34:15 +0800
commitbbf1932c3085706a6a3bc8d7ba79e007ad7bda15 (patch)
tree4e14e8282070a6ee6d274343a44b78f8f7c112c8 /builtin/commit-graph.c
parent66e6babac6c3698cdcb8944307a0d5ac21562ab0 (diff)
parent876b1423317071f43c99666f3fc3db3642dfbe14 (diff)
downloadgit-bbf1932c3085706a6a3bc8d7ba79e007ad7bda15.tar.gz
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git: Git 2.34-rc1 rebase -i: fix rewording with --committer-date-is-author-date dir: fix directory-matching bug gpg-interface: avoid buffer overrun in parse_ssh_output() gpg-interface: handle missing " with " gracefully in parse_ssh_output() A few more topics before -rc1 i18n: fix typos found during l10n for git 2.34.0 t5310: drop lib-bundle.sh include format-patch (doc): clarify --base=auto gc: perform incremental repack when implictly enabled fsck: verify multi-pack-index when implictly enabled fsck: verify commit graph when implicitly enabled grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data 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 pretty: colorize pattern matches in commit messages grep: refactor next_match() and match_one_pattern() for external use
Diffstat (limited to 'builtin/commit-graph.c')
-rw-r--r--builtin/commit-graph.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index ab8e5cd59a..4247fbde95 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"))