diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2019-04-26 16:00:04 +0300 |
|---|---|---|
| committer | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2019-04-26 16:04:16 +0300 |
| commit | f095863aa87bbc13143ffa89216831a5cdcf9a28 (patch) | |
| tree | 466dcd1685181572a286e21c5ad4b9bd4da135e3 | |
| parent | 7cee9c9b7d1b9d3d75069769a5f6dd73aa877161 (diff) | |
git gc invocation: don't write commit-graph with core.commitGraph=true
This amends code just added in 52ec70ee ("GarbageCollect RPC writes
commit graph and enables via config", 2019-04-24).
This isn't needed, and will result in "gc" dying in obscure
circumstances on git versions before v2.22.0 (not released yet) if the
existing graph were to be corrupted. See
git-vcs/git@43d3561805 ("commit-graph write: don't die if the existing
graph is corrupt", 2019-03-25).
This isn't needed, and "git gc" as of v2.22.0 pretty does the
equivalent of core.commitGraph=false now when writing out the graph,
because we don't want a screwy existing graph to ruin our day when we
write the new one.
Also, having written all this explanation I find that this change
isn't technically needed because 52ec70ee misspelled the config key as
"commitGrap" instead of "commitGrap*h*", but let's remove this line
anyway.
| -rw-r--r-- | internal/service/repository/gc.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/internal/service/repository/gc.go b/internal/service/repository/gc.go index 0db28a4d0..daf073b57 100644 --- a/internal/service/repository/gc.go +++ b/internal/service/repository/gc.go @@ -59,7 +59,6 @@ func gc(ctx context.Context, in *gitalypb.GarbageCollectRequest) error { // run garbage collect and also write the commit graph args = append(args, - "-c", "core.commitGrap=true", "-c", "gc.writeCommitGraph=true", "gc", ) |