diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 22:50:02 (GMT) |
| commit | 25b336421f7393f54bada27f60658fdfe7270215 (patch) | |
| tree | a23f287b4758d3d49f1d4aeb30ba0748b0a4201c /commit-graph.c | |
| parent | cc908dbc76adea39b2756c1091016e929c66689d (diff) | |
| parent | b09b785c785c93d9e26f4fc754116c24ea02bf3c (diff) | |
| download | git-25b336421f7393f54bada27f60658fdfe7270215.zip git-25b336421f7393f54bada27f60658fdfe7270215.tar.gz git-25b336421f7393f54bada27f60658fdfe7270215.tar.bz2 | |
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
Diffstat (limited to 'commit-graph.c')
| -rw-r--r-- | commit-graph.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commit-graph.c b/commit-graph.c index f013a84..0d0d377 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1707,7 +1707,7 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx) 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->odb); unlink(chain_file_name); |