Merge branch 'ds/commit-graph-expiry-fix'

"git commit-graph write --expire-time=<timestamp>" did not use the
given timestamp correctly, which has been corrected.

* ds/commit-graph-expiry-fix:
  commit-graph: fix buggy --expire-time option

diff --cc builtin/commit-graph.c
Simple merge

diff --cc commit-graph.c
index f013a84e294b13b552b62257bbf2fa7e1c353a82,4df4326b50d342ff7406c5dacbe44df144a324e7..0d0d37787a0c3561d63b6d237fb43790ac8870bd
--- 1/commit-graph.c
--- 2/commit-graph.c
+++ b/commit-graph.c
@@@ -1707,9 -1694,9 +1707,9 @@@ static void expire_commit_graphs(struc
        timestamp_t expire_time = time(NULL);
  
        if (ctx->split_opts && ctx->split_opts->expire_time)
-               expire_time -= ctx->split_opts->expire_time;
+               expire_time = ctx->split_opts->expire_time;
        if (!ctx->split) {
 -              char *chain_file_name = get_chain_filename(ctx->obj_dir);
 +              char *chain_file_name = get_chain_filename(ctx->odb);
                unlink(chain_file_name);
                free(chain_file_name);
                ctx->num_commit_graphs_after = 0;

diff --cc t/t5324-split-commit-graph.sh
Simple merge