@matheusbsbs / matheus-bagliano / commits / b09b785c78
Fork 0

commit-graph: fix buggy --expire-time option

The commit-graph builtin has an --expire-time option that takes a datetime using OPT_EXPIRY_DATE(). However, the implementation inside expire_commit_graphs() was treating a non-zero value as a number of seconds to subtract from "now". Update t5323-split-commit-graph.sh to demonstrate the correct value of the --expire-time option by actually creating a crud .graph file with mtime earlier than the expire time. Instead of using a super- early time (1980) we use an explicit, and recent, time. Using test-tool chmtime to create two files on either end of an exact second, we create a test that catches this failure no matter the current time. Using a fixed date is more portable than trying to format a relative date string into the --expiry-date input. I noticed this when inspecting some Scalar repos that had an excess number of commit-graph files. In Scalar, we were using this second interpretation by using "--expire-time=3600" to mean "delete graphs older than one hour ago" to avoid deleting a commit-graph that a foreground process may be trying to load. Also I noticed that the help text was copied from the --max-commits option. Fix that help text. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Derrick Stolee committed Apr 1, 2020 at 21:00 UTC b09b785c785c93d9e26f4fc754116c24ea02bf3c
3 files changed +9 -3
builtin/commit-graph.c
+1 -1
@@ -175,7 +175,7 @@ static int graph_write(int argc, const char **argv)
175 OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
176 N_("maximum ratio between two levels of a split commit-graph")),
177 OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
178 - N_("maximum number of commits in a non-base split commit-graph")),
178 + N_("only expire files older than a given date-time")),
179 OPT_END(),
180 };
181
commit-graph.c
+1 -1
@@ -1694,7 +1694,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
1694 timestamp_t expire_time = time(NULL);
1695
1696 if (ctx->split_opts && ctx->split_opts->expire_time)
1697 - expire_time -= ctx->split_opts->expire_time;
1697 + expire_time = ctx->split_opts->expire_time;
1698 if (!ctx->split) {
1699 char *chain_file_name = get_chain_filename(ctx->obj_dir);
1700 unlink(chain_file_name);
t/t5324-split-commit-graph.sh
+7 -1
@@ -202,8 +202,14 @@ test_expect_success 'test merge stragety constants' '
202 git config core.commitGraph true &&
203 test_line_count = 2 $graphdir/commit-graph-chain &&
204 test_commit 15 &&
205 - git commit-graph write --reachable --split --size-multiple=10 --expire-time=1980-01-01 &&
205 + touch $graphdir/to-delete.graph $graphdir/to-keep.graph &&
206 + test-tool chmtime =1546362000 $graphdir/to-delete.graph &&
207 + test-tool chmtime =1546362001 $graphdir/to-keep.graph &&
208 + git commit-graph write --reachable --split --size-multiple=10 \
209 + --expire-time="2019-01-01 12:00 -05:00" &&
210 test_line_count = 1 $graphdir/commit-graph-chain &&
211 + test_path_is_missing $graphdir/to-delete.graph &&
212 + test_path_is_file $graphdir/to-keep.graph &&
213 ls $graphdir/graph-*.graph >graph-files &&
214 test_line_count = 3 graph-files
215 ) &&